Bug 1054703 - Part 7: Flatten embedding/components/windowwatcher/{public,src}/ into parent directory. r=bsmedberg

--HG--
rename : embedding/components/windowwatcher/src/nsAutoWindowStateHelper.cpp => embedding/components/windowwatcher/nsAutoWindowStateHelper.cpp
rename : embedding/components/windowwatcher/src/nsAutoWindowStateHelper.h => embedding/components/windowwatcher/nsAutoWindowStateHelper.h
rename : embedding/components/windowwatcher/src/nsDialogParamBlock.cpp => embedding/components/windowwatcher/nsDialogParamBlock.cpp
rename : embedding/components/windowwatcher/src/nsDialogParamBlock.h => embedding/components/windowwatcher/nsDialogParamBlock.h
rename : embedding/components/windowwatcher/public/nsIDialogParamBlock.idl => embedding/components/windowwatcher/nsIDialogParamBlock.idl
rename : embedding/components/windowwatcher/public/nsIPromptFactory.idl => embedding/components/windowwatcher/nsIPromptFactory.idl
rename : embedding/components/windowwatcher/public/nsIPromptService.idl => embedding/components/windowwatcher/nsIPromptService.idl
rename : embedding/components/windowwatcher/public/nsIPromptService2.idl => embedding/components/windowwatcher/nsIPromptService2.idl
rename : embedding/components/windowwatcher/public/nsIWindowWatcher.idl => embedding/components/windowwatcher/nsIWindowWatcher.idl
rename : embedding/components/windowwatcher/public/nsPIPromptService.idl => embedding/components/windowwatcher/nsPIPromptService.idl
rename : embedding/components/windowwatcher/public/nsPIWindowWatcher.idl => embedding/components/windowwatcher/nsPIWindowWatcher.idl
rename : embedding/components/windowwatcher/public/nsPromptUtils.h => embedding/components/windowwatcher/nsPromptUtils.h
rename : embedding/components/windowwatcher/src/nsWindowWatcher.cpp => embedding/components/windowwatcher/nsWindowWatcher.cpp
rename : embedding/components/windowwatcher/src/nsWindowWatcher.h => embedding/components/windowwatcher/nsWindowWatcher.h

embedding/components/build/moz.build

@@ -16,7 +16,7 @@ LOCAL_INCLUDES += [
     '../commandhandler',
     '../find',
     '../webbrowserpersist',
-    '../windowwatcher/src',
+    '../windowwatcher',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':

embedding/components/windowwatcher/moz.build

@@ -4,4 +4,40 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['public', 'src']
+XPIDL_SOURCES += [
+    'nsIDialogParamBlock.idl',
+    'nsIPromptFactory.idl',
+    'nsIPromptService.idl',
+    'nsIPromptService2.idl',
+    'nsIWindowWatcher.idl',
+    'nsPIPromptService.idl',
+    'nsPIWindowWatcher.idl',
+]
+
+XPIDL_MODULE = 'windowwatcher'
+
+EXPORTS += [
+    'nsPromptUtils.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsAutoWindowStateHelper.cpp',
+    'nsWindowWatcher.cpp',
+]
+
+EXPORTS += [
+    'nsWindowWatcher.h',
+]
+
+if CONFIG['MOZ_XUL']:
+    UNIFIED_SOURCES += [
+        'nsDialogParamBlock.cpp',
+    ]
+
+FAIL_ON_WARNINGS = True
+
+FINAL_LIBRARY = 'xul'
+# For nsJSUtils
+LOCAL_INCLUDES += [
+    '/dom/base',
+]

embedding/components/windowwatcher/public/moz.build

@@ -1,22 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'nsIDialogParamBlock.idl',
-    'nsIPromptFactory.idl',
-    'nsIPromptService.idl',
-    'nsIPromptService2.idl',
-    'nsIWindowWatcher.idl',
-    'nsPIPromptService.idl',
-    'nsPIWindowWatcher.idl',
-]
-
-XPIDL_MODULE = 'windowwatcher'
-
-EXPORTS += [
-    'nsPromptUtils.h',
-]
-

embedding/components/windowwatcher/src/moz.build

@@ -1,28 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-UNIFIED_SOURCES += [
-    'nsAutoWindowStateHelper.cpp',
-    'nsWindowWatcher.cpp',
-]
-
-EXPORTS += [
-    'nsWindowWatcher.h',
-]
-
-if CONFIG['MOZ_XUL']:
-    UNIFIED_SOURCES += [
-        'nsDialogParamBlock.cpp',
-    ]
-
-FAIL_ON_WARNINGS = True
-
-FINAL_LIBRARY = 'xul'
-# For nsJSUtils
-LOCAL_INCLUDES += [
-    '/dom/base',
-]
-

mobile/android/components/PromptService.js

@@ -683,7 +683,7 @@ let PromptUtils = {
     this.pwmgr.modifyLogin(aLogin, propBag);
   },
 
-  // JS port of http://mxr.mozilla.org/mozilla-central/source/embedding/components/windowwatcher/src/nsPrompt.cpp#388
+  // JS port of http://mxr.mozilla.org/mozilla-central/source/embedding/components/windowwatcher/nsPrompt.cpp#388
   makeDialogText: function pu_makeDialogText(aChannel, aAuthInfo) {
     let isProxy    = (aAuthInfo.flags & Ci.nsIAuthInformation.AUTH_PROXY);
     let isPassOnly = (aAuthInfo.flags & Ci.nsIAuthInformation.ONLY_PASSWORD);
@@ -715,7 +715,7 @@ let PromptUtils = {
     return text;
   },
 
-  // JS port of http://mxr.mozilla.org/mozilla-central/source/embedding/components/windowwatcher/public/nsPromptUtils.h#89
+  // JS port of http://mxr.mozilla.org/mozilla-central/source/embedding/components/windowwatcher/nsPromptUtils.h#89
   getAuthHostPort: function pu_getAuthHostPort(aChannel, aAuthInfo) {
     let uri = aChannel.URI;
     let res = { host: null, port: -1 };