Bug 1038458 - Part 6: Flatten browser/components/sessionstore/src/ directory. r=mak
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Sat, 26 Jul 2014 09:32:08 -0700
changeset 196211 e102b0c9d37e263ce220d22cabfd81199d82c375
parent 196210 3dc6793e0bab0bd9eebdcce439efa289a77d129a
child 196212 6c2777eb725a54ff594493d4f99528e9d6d83a1a
push id46813
push userbirunthan@mohanathas.com
push dateSat, 26 Jul 2014 16:32:46 +0000
treeherdermozilla-inbound@6c2777eb725a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1038458
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1038458 - Part 6: Flatten browser/components/sessionstore/src/ directory. r=mak
browser/components/sessionstore/ContentRestore.jsm
browser/components/sessionstore/DocShellCapabilities.jsm
browser/components/sessionstore/FrameTree.jsm
browser/components/sessionstore/GlobalState.jsm
browser/components/sessionstore/PageStyle.jsm
browser/components/sessionstore/PrivacyFilter.jsm
browser/components/sessionstore/PrivacyLevel.jsm
browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
browser/components/sessionstore/SessionCookies.jsm
browser/components/sessionstore/SessionFile.jsm
browser/components/sessionstore/SessionHistory.jsm
browser/components/sessionstore/SessionMigration.jsm
browser/components/sessionstore/SessionSaver.jsm
browser/components/sessionstore/SessionStorage.jsm
browser/components/sessionstore/SessionStore.jsm
browser/components/sessionstore/SessionWorker.js
browser/components/sessionstore/SessionWorker.jsm
browser/components/sessionstore/TabAttributes.jsm
browser/components/sessionstore/TabState.jsm
browser/components/sessionstore/TabStateCache.jsm
browser/components/sessionstore/Utils.jsm
browser/components/sessionstore/moz.build
browser/components/sessionstore/nsSessionStartup.js
browser/components/sessionstore/nsSessionStore.js
browser/components/sessionstore/nsSessionStore.manifest
browser/components/sessionstore/src/ContentRestore.jsm
browser/components/sessionstore/src/DocShellCapabilities.jsm
browser/components/sessionstore/src/FrameTree.jsm
browser/components/sessionstore/src/GlobalState.jsm
browser/components/sessionstore/src/PageStyle.jsm
browser/components/sessionstore/src/PrivacyFilter.jsm
browser/components/sessionstore/src/PrivacyLevel.jsm
browser/components/sessionstore/src/RecentlyClosedTabsAndWindowsMenuUtils.jsm
browser/components/sessionstore/src/SessionCookies.jsm
browser/components/sessionstore/src/SessionFile.jsm
browser/components/sessionstore/src/SessionHistory.jsm
browser/components/sessionstore/src/SessionMigration.jsm
browser/components/sessionstore/src/SessionSaver.jsm
browser/components/sessionstore/src/SessionStorage.jsm
browser/components/sessionstore/src/SessionStore.jsm
browser/components/sessionstore/src/SessionWorker.js
browser/components/sessionstore/src/SessionWorker.jsm
browser/components/sessionstore/src/TabAttributes.jsm
browser/components/sessionstore/src/TabState.jsm
browser/components/sessionstore/src/TabStateCache.jsm
browser/components/sessionstore/src/Utils.jsm
browser/components/sessionstore/src/moz.build
browser/components/sessionstore/src/nsSessionStartup.js
browser/components/sessionstore/src/nsSessionStore.js
browser/components/sessionstore/src/nsSessionStore.manifest
rename from browser/components/sessionstore/src/ContentRestore.jsm
rename to browser/components/sessionstore/ContentRestore.jsm
rename from browser/components/sessionstore/src/DocShellCapabilities.jsm
rename to browser/components/sessionstore/DocShellCapabilities.jsm
rename from browser/components/sessionstore/src/FrameTree.jsm
rename to browser/components/sessionstore/FrameTree.jsm
rename from browser/components/sessionstore/src/GlobalState.jsm
rename to browser/components/sessionstore/GlobalState.jsm
rename from browser/components/sessionstore/src/PageStyle.jsm
rename to browser/components/sessionstore/PageStyle.jsm
rename from browser/components/sessionstore/src/PrivacyFilter.jsm
rename to browser/components/sessionstore/PrivacyFilter.jsm
rename from browser/components/sessionstore/src/PrivacyLevel.jsm
rename to browser/components/sessionstore/PrivacyLevel.jsm
rename from browser/components/sessionstore/src/RecentlyClosedTabsAndWindowsMenuUtils.jsm
rename to browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
rename from browser/components/sessionstore/src/SessionCookies.jsm
rename to browser/components/sessionstore/SessionCookies.jsm
rename from browser/components/sessionstore/src/SessionFile.jsm
rename to browser/components/sessionstore/SessionFile.jsm
rename from browser/components/sessionstore/src/SessionHistory.jsm
rename to browser/components/sessionstore/SessionHistory.jsm
rename from browser/components/sessionstore/src/SessionMigration.jsm
rename to browser/components/sessionstore/SessionMigration.jsm
rename from browser/components/sessionstore/src/SessionSaver.jsm
rename to browser/components/sessionstore/SessionSaver.jsm
rename from browser/components/sessionstore/src/SessionStorage.jsm
rename to browser/components/sessionstore/SessionStorage.jsm
rename from browser/components/sessionstore/src/SessionStore.jsm
rename to browser/components/sessionstore/SessionStore.jsm
rename from browser/components/sessionstore/src/SessionWorker.js
rename to browser/components/sessionstore/SessionWorker.js
rename from browser/components/sessionstore/src/SessionWorker.jsm
rename to browser/components/sessionstore/SessionWorker.jsm
rename from browser/components/sessionstore/src/TabAttributes.jsm
rename to browser/components/sessionstore/TabAttributes.jsm
rename from browser/components/sessionstore/src/TabState.jsm
rename to browser/components/sessionstore/TabState.jsm
rename from browser/components/sessionstore/src/TabStateCache.jsm
rename to browser/components/sessionstore/TabStateCache.jsm
rename from browser/components/sessionstore/src/Utils.jsm
rename to browser/components/sessionstore/Utils.jsm
--- a/browser/components/sessionstore/moz.build
+++ b/browser/components/sessionstore/moz.build
@@ -1,24 +1,53 @@
 # -*- 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/.
 
-DIRS += ['src']
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+
+JAR_MANIFESTS += ['jar.mn']
 
 XPIDL_SOURCES += [
     'nsISessionStartup.idl',
     'nsISessionStore.idl',
 ]
 
 XPIDL_MODULE = 'sessionstore'
 
-XPCSHELL_TESTS_MANIFESTS += [
-    'test/unit/xpcshell.ini',
+EXTRA_COMPONENTS += [
+    'nsSessionStartup.js',
+    'nsSessionStore.js',
+    'nsSessionStore.manifest',
 ]
 
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser.ini',
+JS_MODULES_PATH = 'modules/sessionstore'
+
+EXTRA_JS_MODULES = [
+    'ContentRestore.jsm',
+    'DocShellCapabilities.jsm',
+    'FrameTree.jsm',
+    'GlobalState.jsm',
+    'PageStyle.jsm',
+    'PrivacyFilter.jsm',
+    'PrivacyLevel.jsm',
+    'RecentlyClosedTabsAndWindowsMenuUtils.jsm',
+    'SessionCookies.jsm',
+    'SessionFile.jsm',
+    'SessionHistory.jsm',
+    'SessionMigration.jsm',
+    'SessionStorage.jsm',
+    'SessionWorker.js',
+    'SessionWorker.jsm',
+    'TabAttributes.jsm',
+    'TabState.jsm',
+    'TabStateCache.jsm',
+    'Utils.jsm',
 ]
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+EXTRA_PP_JS_MODULES += [
+    'SessionSaver.jsm',
+    'SessionStore.jsm',
+]
+
rename from browser/components/sessionstore/src/nsSessionStartup.js
rename to browser/components/sessionstore/nsSessionStartup.js
rename from browser/components/sessionstore/src/nsSessionStore.js
rename to browser/components/sessionstore/nsSessionStore.js
rename from browser/components/sessionstore/src/nsSessionStore.manifest
rename to browser/components/sessionstore/nsSessionStore.manifest
deleted file mode 100644
--- a/browser/components/sessionstore/src/moz.build
+++ /dev/null
@@ -1,41 +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/.
-
-EXTRA_COMPONENTS += [
-    'nsSessionStartup.js',
-    'nsSessionStore.js',
-    'nsSessionStore.manifest',
-]
-
-JS_MODULES_PATH = 'modules/sessionstore'
-
-EXTRA_JS_MODULES = [
-    'ContentRestore.jsm',
-    'DocShellCapabilities.jsm',
-    'FrameTree.jsm',
-    'GlobalState.jsm',
-    'PageStyle.jsm',
-    'PrivacyFilter.jsm',
-    'PrivacyLevel.jsm',
-    'RecentlyClosedTabsAndWindowsMenuUtils.jsm',
-    'SessionCookies.jsm',
-    'SessionFile.jsm',
-    'SessionHistory.jsm',
-    'SessionMigration.jsm',
-    'SessionStorage.jsm',
-    'SessionWorker.js',
-    'SessionWorker.jsm',
-    'TabAttributes.jsm',
-    'TabState.jsm',
-    'TabStateCache.jsm',
-    'Utils.jsm',
-]
-
-EXTRA_PP_JS_MODULES += [
-    'SessionSaver.jsm',
-    'SessionStore.jsm',
-]
-