Backed out 2 changesets (bug 1347204) for ESlint failure on browser_ext_themes_ntp_colors. CLOSED TREE

Backed out changeset 29caa8009784 (bug 1347204)
Backed out changeset 46922541d170 (bug 1347204)

browser/base/content/contentTheme.js

@@ -1,108 +0,0 @@
-/* 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/. */
-
-"use strict";
-
-{
-
-function _isTextColorDark(r, g, b) {
-  return (0.2125 * r + 0.7154 * g + 0.0721 * b) <= 110;
-}
-
-const inContentVariableMap = [
-  ["--newtab-background-color", {
-    lwtProperty: "ntp_background"
-  }],
-  ["--newtab-text-primary-color", {
-    lwtProperty: "ntp_text",
-    processColor(rgbaChannels, element) {
-      if (!rgbaChannels) {
-        element.removeAttribute("lwt-newtab");
-        element.removeAttribute("lwt-newtab-brighttext");
-        return null;
-      }
-
-      element.setAttribute("lwt-newtab", "true");
-      const {r, g, b, a} = rgbaChannels;
-      if (!_isTextColorDark(r, g, b)) {
-        element.setAttribute("lwt-newtab-brighttext", "true");
-      }
-
-      return `rgba(${r}, ${g}, ${b}, ${a})`;
-    },
-  }],
-];
-
-/**
- * ContentThemeController handles theme updates sent by the frame script.
- * To be able to use ContentThemeController, you must add your page to the whitelist
- * in LightweightThemeChildListener.jsm
- */
-const ContentThemeController = {
-  /**
-   * Tell the frame script that the page supports theming, and watch for updates
-   * from the frame script.
-   */
-  init() {
-    addEventListener("LightweightTheme:Set", this);
-
-    const event = new CustomEvent("LightweightTheme:Support", {bubbles: true});
-    document.dispatchEvent(event);
-  },
-
-  /**
-   * Handle theme updates from the frame script.
-   * @param event object containing the theme update.
-   */
-  handleEvent({ detail }) {
-    if (detail.type == "LightweightTheme:Update") {
-      let {data} = detail;
-      if (!data) {
-        data = {};
-      }
-      this._setProperties(document.body, data);
-    }
-  },
-
-  /**
-   * Set a CSS variable to a given value
-   * @param elem The element where the CSS variable should be added.
-   * @param variableName The CSS variable to set.
-   * @param value The new value of the CSS variable.
-   */
-  _setProperty(elem, variableName, value) {
-    if (value) {
-      elem.style.setProperty(variableName, value);
-    } else {
-      elem.style.removeProperty(variableName);
-    }
-  },
-
-  /**
-   * Apply theme data to an element
-   * @param root The element where the properties should be applied.
-   * @param themeData The theme data.
-   */
-  _setProperties(elem, themeData) {
-    for (let [cssVarName, definition] of inContentVariableMap) {
-      const {
-        lwtProperty,
-        processColor,
-      } = definition;
-      let value = themeData[lwtProperty];
-
-      if (processColor) {
-        value = processColor(value, document.body);
-      } else if (value) {
-        const {r, g, b, a} = value;
-        value = `rgba(${r}, ${g}, ${b}, ${a})`;
-      }
-
-      this._setProperty(elem, cssVarName, value);
-    }
-  },
-};
-ContentThemeController.init();
-
-}

browser/base/content/tab-content.js

@@ -24,8 +24,6 @@ ChromeUtils.defineModuleGetter(this, "ReaderMode",
   "resource://gre/modules/ReaderMode.jsm");
 ChromeUtils.defineModuleGetter(this, "PageStyleHandler",
   "resource:///modules/PageStyleHandler.jsm");
-ChromeUtils.defineModuleGetter(this, "LightweightThemeChildListener",
-  "resource:///modules/LightweightThemeChildListener.jsm");
 
 // TabChildGlobal
 var global = this;
@@ -81,33 +79,6 @@ addMessageListener("MixedContent:ReenableProtection", function() {
   docShell.mixedContentChannel = null;
 });
 
-var LightweightThemeChildListenerStub = {
-  _childListener: null,
-  get childListener() {
-    if (!this._childListener) {
-      this._childListener = new LightweightThemeChildListener();
-    }
-    return this._childListener;
-  },
-
-  init() {
-    addEventListener("LightweightTheme:Support", this, false, true);
-    addMessageListener("LightweightTheme:Update", this);
-    sendAsyncMessage("LightweightTheme:Request");
-  },
-
-  handleEvent(event) {
-    return this.childListener.handleEvent(event);
-  },
-
-  receiveMessage(msg) {
-    return this.childListener.receiveMessage(msg);
-  },
-};
-
-LightweightThemeChildListenerStub.init();
-
-
 var AboutReaderListener = {
 
   _articlePromise: null,

browser/base/content/test/performance/browser_startup_content.js

@@ -56,7 +56,6 @@ const whitelist = {
     "resource:///modules/ContentLinkHandler.jsm",
     "resource:///modules/ContentMetaHandler.jsm",
     "resource:///modules/PageStyleHandler.jsm",
-    "resource:///modules/LightweightThemeChildListener.jsm",
     "resource://gre/modules/BrowserUtils.jsm",
     "resource://gre/modules/E10SUtils.jsm",
     "resource://gre/modules/PrivateBrowsingUtils.jsm",

browser/base/jar.mn

@@ -101,7 +101,6 @@ browser.jar:
         content/browser/webext-panels.js              (content/webext-panels.js)
 *       content/browser/webext-panels.xul             (content/webext-panels.xul)
         content/browser/nsContextMenu.js              (content/nsContextMenu.js)
-        content/browser/contentTheme.js               (content/contentTheme.js)
 #ifdef XP_MACOSX
 # XXX: We should exclude this one as well (bug 71895)
 *       content/browser/hiddenWindow.xul              (content/hiddenWindow.xul)

browser/components/nsBrowserGlue.js

@@ -747,8 +747,6 @@ BrowserGlue.prototype = {
       popup_border: "#27272b",
       toolbar_field_text: "rgb(249, 249, 250)",
       toolbar_field_border: "rgba(249, 249, 250, 0.2)",
-      ntp_background: "#2A2A2E",
-      ntp_text: "rgb(249, 249, 250)",
       author: vendorShortName,
     }, {
       useInDarkMode: true

browser/extensions/activity-stream/bin/render-activity-stream-html.js

@@ -178,7 +178,6 @@ function templateHTML(options, html) {
   const debugString = options.debug ? "-dev" : "";
   const scripts = [
     "chrome://browser/content/contentSearchUI.js",
-    "chrome://browser/content/contentTheme.js",
     `${options.baseUrl}vendor/react${debugString}.js`,
     `${options.baseUrl}vendor/react-dom${debugString}.js`,
     `${options.baseUrl}vendor/prop-types.js`,

browser/extensions/activity-stream/common/Actions.jsm

@@ -97,6 +97,7 @@ for (const type of [
   "TELEMETRY_PERFORMANCE_EVENT",
   "TELEMETRY_UNDESIRED_EVENT",
   "TELEMETRY_USER_EVENT",
+  "THEME_UPDATE",
   "TOP_SITES_CANCEL_EDIT",
   "TOP_SITES_EDIT",
   "TOP_SITES_INSERT",

browser/extensions/activity-stream/common/Reducers.jsm

@@ -31,6 +31,7 @@ const INITIAL_STATE = {
     initialized: false,
     values: {}
   },
+  Theme: {className: ""},
   Dialog: {
     visible: false,
     data: {}
@@ -373,10 +374,19 @@ function Snippets(prevState = INITIAL_STATE.Snippets, action) {
   }
 }
 
+function Theme(prevState = INITIAL_STATE.Theme, action) {
+  switch (action.type) {
+    case at.THEME_UPDATE:
+      return Object.assign({}, prevState, action.data);
+    default:
+      return prevState;
+  }
+}
+
 this.INITIAL_STATE = INITIAL_STATE;
 this.TOP_SITES_DEFAULT_ROWS = TOP_SITES_DEFAULT_ROWS;
 this.TOP_SITES_MAX_SITES_PER_ROW = TOP_SITES_MAX_SITES_PER_ROW;
 
-this.reducers = {TopSites, App, Snippets, Prefs, Dialog, Sections};
+this.reducers = {TopSites, App, Snippets, Prefs, Dialog, Sections, Theme};
 
 const EXPORTED_SYMBOLS = ["reducers", "INITIAL_STATE", "insertPinned", "TOP_SITES_DEFAULT_ROWS", "TOP_SITES_MAX_SITES_PER_ROW"];

browser/extensions/activity-stream/content-src/components/ASRouterAdmin/ASRouterAdmin.scss

@@ -43,7 +43,7 @@
         background: $yellow-50;
         padding: 2px 5px;
 
-        [lwt-newtab-brighttext] & {
+        .dark-theme & {
           color: $black;
         }
       }

browser/extensions/activity-stream/content-src/components/Base/Base.jsx

@@ -26,7 +26,10 @@ function addLocaleDataForReactIntl(locale) {
 
 export class _Base extends React.PureComponent {
   componentWillMount() {
-    const {App, locale} = this.props;
+    const {App, locale, Theme} = this.props;
+    if (Theme.className) {
+      this.updateTheme(Theme);
+    }
     this.sendNewTabRehydrated(App);
     addLocaleDataForReactIntl(locale);
   }
@@ -42,17 +45,18 @@ export class _Base extends React.PureComponent {
   }
 
   componentWillUnmount() {
-    this.updateTheme();
+    this.updateTheme({className: ""});
   }
 
-  componentWillUpdate({App}) {
-    this.updateTheme();
+  componentWillUpdate({App, Theme}) {
+    this.updateTheme(Theme);
     this.sendNewTabRehydrated(App);
   }
 
-  updateTheme() {
+  updateTheme(Theme) {
     const bodyClassName = [
       "activity-stream",
+      Theme.className,
       this.props.isFirstrun ? "welcome" : ""
     ].filter(v => v).join(" ");
     global.document.body.className = bodyClassName;
@@ -148,4 +152,4 @@ export class BaseContent extends React.PureComponent {
   }
 }
 
-export const Base = connect(state => ({App: state.App, Prefs: state.Prefs}))(_Base);
+export const Base = connect(state => ({App: state.App, Prefs: state.Prefs, Theme: state.Theme}))(_Base);

browser/extensions/activity-stream/content-src/components/Card/_Card.scss

@@ -71,7 +71,7 @@
     overflow: hidden;
     position: relative;
 
-    [lwt-newtab-brighttext] & {
+    .dark-theme & {
       background-color: $grey-60;
     }
 

browser/extensions/activity-stream/content-src/styles/_theme.scss

@@ -77,7 +77,7 @@ body {
 }
 
 // Dark theme
-body[lwt-newtab-brighttext] {
+.dark-theme {
   // General styles
   --newtab-background-color: $grey-80;
   --newtab-border-primary-color: $grey-10-80;

browser/extensions/activity-stream/content-src/styles/activity-stream-mac.scss

@@ -4,7 +4,7 @@ $os-infopanel-arrow-height: 10px;
 $os-infopanel-arrow-offset-end: 7px;
 $os-infopanel-arrow-width: 18px;
 
-[lwt-newtab-brighttext] {
+.dark-theme {
   -moz-osx-font-smoothing: grayscale;
 }
 

browser/extensions/activity-stream/css/activity-stream-linux.css

@@ -66,7 +66,7 @@ body {
   --newtab-snippets-background-color: #FFF;
   --newtab-snippets-hairline-color: transparent; }
 
-body[lwt-newtab-brighttext] {
+.dark-theme {
   --newtab-background-color: #2A2A2E;
   --newtab-border-primary-color: rgba(249, 249, 250, 0.8);
   --newtab-border-secondary-color: rgba(249, 249, 250, 0.1);
@@ -1357,7 +1357,7 @@ main {
     height: 122px;
     overflow: hidden;
     position: relative; }
-    [lwt-newtab-brighttext] .card-outer .card-preview-image-outer {
+    .dark-theme .card-outer .card-preview-image-outer {
       background-color: #4A4A4F; }
     .card-outer .card-preview-image-outer::after {
       border-bottom: 1px solid var(--newtab-card-hairline-color);
@@ -1680,7 +1680,7 @@ main {
   .asrouter-admin .message-item.current .message-id span {
     background: #FFE900;
     padding: 2px 5px; }
-    [lwt-newtab-brighttext] .asrouter-admin .message-item.current .message-id span {
+    .dark-theme .asrouter-admin .message-item.current .message-id span {
       color: #000; }
   .asrouter-admin .message-item.blocked .message-id,
   .asrouter-admin .message-item.blocked .message-summary {

browser/extensions/activity-stream/css/activity-stream-mac.css

@@ -1,6 +1,6 @@
 @charset "UTF-8";
 /* This is the mac variant */
-[lwt-newtab-brighttext] {
+.dark-theme {
   -moz-osx-font-smoothing: grayscale; }
 
 html {
@@ -69,7 +69,7 @@ body {
   --newtab-snippets-background-color: #FFF;
   --newtab-snippets-hairline-color: transparent; }
 
-body[lwt-newtab-brighttext] {
+.dark-theme {
   --newtab-background-color: #2A2A2E;
   --newtab-border-primary-color: rgba(249, 249, 250, 0.8);
   --newtab-border-secondary-color: rgba(249, 249, 250, 0.1);
@@ -1360,7 +1360,7 @@ main {
     height: 122px;
     overflow: hidden;
     position: relative; }
-    [lwt-newtab-brighttext] .card-outer .card-preview-image-outer {
+    .dark-theme .card-outer .card-preview-image-outer {
       background-color: #4A4A4F; }
     .card-outer .card-preview-image-outer::after {
       border-bottom: 1px solid var(--newtab-card-hairline-color);
@@ -1683,7 +1683,7 @@ main {
   .asrouter-admin .message-item.current .message-id span {
     background: #FFE900;
     padding: 2px 5px; }
-    [lwt-newtab-brighttext] .asrouter-admin .message-item.current .message-id span {
+    .dark-theme .asrouter-admin .message-item.current .message-id span {
       color: #000; }
   .asrouter-admin .message-item.blocked .message-id,
   .asrouter-admin .message-item.blocked .message-summary {

browser/extensions/activity-stream/css/activity-stream-windows.css

@@ -66,7 +66,7 @@ body {
   --newtab-snippets-background-color: #FFF;
   --newtab-snippets-hairline-color: transparent; }
 
-body[lwt-newtab-brighttext] {
+.dark-theme {
   --newtab-background-color: #2A2A2E;
   --newtab-border-primary-color: rgba(249, 249, 250, 0.8);
   --newtab-border-secondary-color: rgba(249, 249, 250, 0.1);
@@ -1357,7 +1357,7 @@ main {
     height: 122px;
     overflow: hidden;
     position: relative; }
-    [lwt-newtab-brighttext] .card-outer .card-preview-image-outer {
+    .dark-theme .card-outer .card-preview-image-outer {
       background-color: #4A4A4F; }
     .card-outer .card-preview-image-outer::after {
       border-bottom: 1px solid var(--newtab-card-hairline-color);
@@ -1680,7 +1680,7 @@ main {
   .asrouter-admin .message-item.current .message-id span {
     background: #FFE900;
     padding: 2px 5px; }
-    [lwt-newtab-brighttext] .asrouter-admin .message-item.current .message-id span {
+    .dark-theme .asrouter-admin .message-item.current .message-id span {
       color: #000; }
   .asrouter-admin .message-item.blocked .message-id,
   .asrouter-admin .message-item.blocked .message-summary {

browser/extensions/activity-stream/data/content/activity-stream.bundle.js

@@ -112,7 +112,7 @@ const actionTypes = {};
 /* harmony export (immutable) */ __webpack_exports__["c"] = actionTypes;
 
 
-for (const type of ["ADDONS_INFO_REQUEST", "ADDONS_INFO_RESPONSE", "ARCHIVE_FROM_POCKET", "AS_ROUTER_TELEMETRY_USER_EVENT", "BLOCK_URL", "BOOKMARK_URL", "COPY_DOWNLOAD_LINK", "DELETE_BOOKMARK_BY_ID", "DELETE_FROM_POCKET", "DELETE_HISTORY_URL", "DIALOG_CANCEL", "DIALOG_OPEN", "DISABLE_ONBOARDING", "DOWNLOAD_CHANGED", "INIT", "MIGRATION_CANCEL", "MIGRATION_COMPLETED", "MIGRATION_START", "NEW_TAB_INIT", "NEW_TAB_INITIAL_STATE", "NEW_TAB_LOAD", "NEW_TAB_REHYDRATED", "NEW_TAB_STATE_REQUEST", "NEW_TAB_UNLOAD", "OPEN_DOWNLOAD_FILE", "OPEN_LINK", "OPEN_NEW_WINDOW", "OPEN_PRIVATE_WINDOW", "OPEN_WEBEXT_SETTINGS", "PAGE_PRERENDERED", "PLACES_BOOKMARK_ADDED", "PLACES_BOOKMARK_REMOVED", "PLACES_HISTORY_CLEARED", "PLACES_LINKS_CHANGED", "PLACES_LINK_BLOCKED", "PLACES_LINK_DELETED", "PLACES_SAVED_TO_POCKET", "PREFS_INITIAL_VALUES", "PREF_CHANGED", "PREVIEW_REQUEST", "PREVIEW_REQUEST_CANCEL", "PREVIEW_RESPONSE", "REMOVE_DOWNLOAD_FILE", "RICH_ICON_MISSING", "SAVE_SESSION_PERF_DATA", "SAVE_TO_POCKET", "SCREENSHOT_UPDATED", "SECTION_DEREGISTER", "SECTION_DISABLE", "SECTION_ENABLE", "SECTION_MOVE", "SECTION_OPTIONS_CHANGED", "SECTION_REGISTER", "SECTION_UPDATE", "SECTION_UPDATE_CARD", "SETTINGS_CLOSE", "SETTINGS_OPEN", "SET_PREF", "SHOW_DOWNLOAD_FILE", "SHOW_FIREFOX_ACCOUNTS", "SKIPPED_SIGNIN", "SNIPPETS_BLOCKLIST_CLEARED", "SNIPPETS_BLOCKLIST_UPDATED", "SNIPPETS_DATA", "SNIPPETS_RESET", "SNIPPET_BLOCKED", "SUBMIT_EMAIL", "SYSTEM_TICK", "TELEMETRY_IMPRESSION_STATS", "TELEMETRY_PERFORMANCE_EVENT", "TELEMETRY_UNDESIRED_EVENT", "TELEMETRY_USER_EVENT", "TOP_SITES_CANCEL_EDIT", "TOP_SITES_EDIT", "TOP_SITES_INSERT", "TOP_SITES_PIN", "TOP_SITES_PREFS_UPDATED", "TOP_SITES_UNPIN", "TOP_SITES_UPDATED", "TOTAL_BOOKMARKS_REQUEST", "TOTAL_BOOKMARKS_RESPONSE", "UNINIT", "UPDATE_SECTION_PREFS", "WEBEXT_CLICK", "WEBEXT_DISMISS"]) {
+for (const type of ["ADDONS_INFO_REQUEST", "ADDONS_INFO_RESPONSE", "ARCHIVE_FROM_POCKET", "AS_ROUTER_TELEMETRY_USER_EVENT", "BLOCK_URL", "BOOKMARK_URL", "COPY_DOWNLOAD_LINK", "DELETE_BOOKMARK_BY_ID", "DELETE_FROM_POCKET", "DELETE_HISTORY_URL", "DIALOG_CANCEL", "DIALOG_OPEN", "DISABLE_ONBOARDING", "DOWNLOAD_CHANGED", "INIT", "MIGRATION_CANCEL", "MIGRATION_COMPLETED", "MIGRATION_START", "NEW_TAB_INIT", "NEW_TAB_INITIAL_STATE", "NEW_TAB_LOAD", "NEW_TAB_REHYDRATED", "NEW_TAB_STATE_REQUEST", "NEW_TAB_UNLOAD", "OPEN_DOWNLOAD_FILE", "OPEN_LINK", "OPEN_NEW_WINDOW", "OPEN_PRIVATE_WINDOW", "OPEN_WEBEXT_SETTINGS", "PAGE_PRERENDERED", "PLACES_BOOKMARK_ADDED", "PLACES_BOOKMARK_REMOVED", "PLACES_HISTORY_CLEARED", "PLACES_LINKS_CHANGED", "PLACES_LINK_BLOCKED", "PLACES_LINK_DELETED", "PLACES_SAVED_TO_POCKET", "PREFS_INITIAL_VALUES", "PREF_CHANGED", "PREVIEW_REQUEST", "PREVIEW_REQUEST_CANCEL", "PREVIEW_RESPONSE", "REMOVE_DOWNLOAD_FILE", "RICH_ICON_MISSING", "SAVE_SESSION_PERF_DATA", "SAVE_TO_POCKET", "SCREENSHOT_UPDATED", "SECTION_DEREGISTER", "SECTION_DISABLE", "SECTION_ENABLE", "SECTION_MOVE", "SECTION_OPTIONS_CHANGED", "SECTION_REGISTER", "SECTION_UPDATE", "SECTION_UPDATE_CARD", "SETTINGS_CLOSE", "SETTINGS_OPEN", "SET_PREF", "SHOW_DOWNLOAD_FILE", "SHOW_FIREFOX_ACCOUNTS", "SKIPPED_SIGNIN", "SNIPPETS_BLOCKLIST_CLEARED", "SNIPPETS_BLOCKLIST_UPDATED", "SNIPPETS_DATA", "SNIPPETS_RESET", "SNIPPET_BLOCKED", "SUBMIT_EMAIL", "SYSTEM_TICK", "TELEMETRY_IMPRESSION_STATS", "TELEMETRY_PERFORMANCE_EVENT", "TELEMETRY_UNDESIRED_EVENT", "TELEMETRY_USER_EVENT", "THEME_UPDATE", "TOP_SITES_CANCEL_EDIT", "TOP_SITES_EDIT", "TOP_SITES_INSERT", "TOP_SITES_PIN", "TOP_SITES_PREFS_UPDATED", "TOP_SITES_UNPIN", "TOP_SITES_UPDATED", "TOTAL_BOOKMARKS_REQUEST", "TOTAL_BOOKMARKS_RESPONSE", "UNINIT", "UPDATE_SECTION_PREFS", "WEBEXT_CLICK", "WEBEXT_DISMISS"]) {
   actionTypes[type] = type;
 }
 
@@ -540,6 +540,7 @@ const INITIAL_STATE = {
     initialized: false,
     values: {}
   },
+  Theme: { className: "" },
   Dialog: {
     visible: false,
     data: {}
@@ -886,7 +887,16 @@ function Snippets(prevState = INITIAL_STATE.Snippets, action) {
   }
 }
 
-var reducers = { TopSites, App, Snippets, Prefs, Dialog, Sections };
+function Theme(prevState = INITIAL_STATE.Theme, action) {
+  switch (action.type) {
+    case Actions["c" /* actionTypes */].THEME_UPDATE:
+      return Object.assign({}, prevState, action.data);
+    default:
+      return prevState;
+  }
+}
+
+var reducers = { TopSites, App, Snippets, Prefs, Dialog, Sections, Theme };
 
 /***/ }),
 /* 8 */
@@ -6619,7 +6629,10 @@ function addLocaleDataForReactIntl(locale) {
 
 class _Base extends __WEBPACK_IMPORTED_MODULE_8_react___default.a.PureComponent {
   componentWillMount() {
-    const { App, locale } = this.props;
+    const { App, locale, Theme } = this.props;
+    if (Theme.className) {
+      this.updateTheme(Theme);
+    }
     this.sendNewTabRehydrated(App);
     addLocaleDataForReactIntl(locale);
   }
@@ -6635,16 +6648,16 @@ class _Base extends __WEBPACK_IMPORTED_MODULE_8_react___default.a.PureComponent
   }
 
   componentWillUnmount() {
-    this.updateTheme();
+    this.updateTheme({ className: "" });
   }
 
-  componentWillUpdate({ App }) {
-    this.updateTheme();
+  componentWillUpdate({ App, Theme }) {
+    this.updateTheme(Theme);
     this.sendNewTabRehydrated(App);
   }
 
-  updateTheme() {
-    const bodyClassName = ["activity-stream", this.props.isFirstrun ? "welcome" : ""].filter(v => v).join(" ");
+  updateTheme(Theme) {
+    const bodyClassName = ["activity-stream", Theme.className, this.props.isFirstrun ? "welcome" : ""].filter(v => v).join(" ");
     global.document.body.className = bodyClassName;
   }
 
@@ -6752,7 +6765,7 @@ class BaseContent extends __WEBPACK_IMPORTED_MODULE_8_react___default.a.PureComp
 /* unused harmony export BaseContent */
 
 
-const Base = Object(__WEBPACK_IMPORTED_MODULE_4_react_redux__["connect"])(state => ({ App: state.App, Prefs: state.Prefs }))(_Base);
+const Base = Object(__WEBPACK_IMPORTED_MODULE_4_react_redux__["connect"])(state => ({ App: state.App, Prefs: state.Prefs, Theme: state.Theme }))(_Base);
 /* harmony export (immutable) */ __webpack_exports__["a"] = Base;
 
 /* WEBPACK VAR INJECTION */}.call(__webpack_exports__, __webpack_require__(3)))

browser/extensions/activity-stream/install.rdf.in

@@ -8,7 +8,7 @@
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
     <em:unpack>false</em:unpack>
-    <em:version>0.0.0</em:version>
+    <em:version>2018.06.29.1315-e10832e3</em:version>
     <em:name>Activity Stream</em:name>
     <em:description>A rich visual history feed and a reimagined home page make it easier than ever to find exactly what you're looking for in Firefox.</em:description>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>

browser/extensions/activity-stream/lib/ActivityStream.jsm

@@ -26,6 +26,7 @@ const {FaviconFeed} = ChromeUtils.import("resource://activity-stream/lib/Favicon
 const {TopSitesFeed} = ChromeUtils.import("resource://activity-stream/lib/TopSitesFeed.jsm", {});
 const {TopStoriesFeed} = ChromeUtils.import("resource://activity-stream/lib/TopStoriesFeed.jsm", {});
 const {HighlightsFeed} = ChromeUtils.import("resource://activity-stream/lib/HighlightsFeed.jsm", {});
+const {ThemeFeed} = ChromeUtils.import("resource://activity-stream/lib/ThemeFeed.jsm", {});
 const {ASRouterFeed} = ChromeUtils.import("resource://activity-stream/lib/ASRouterFeed.jsm", {});
 
 const DEFAULT_SITES = new Map([
@@ -204,6 +205,12 @@ const FEEDS_DATA = [
     title: "Preferences",
     value: true
   },
+  {
+    name: "theme",
+    factory: () => new ThemeFeed(),
+    title: "Theme",
+    value: true
+  },
   {
     name: "sections",
     factory: () => new SectionsFeed(),

browser/extensions/activity-stream/lib/PrefsFeed.jsm

@@ -6,6 +6,7 @@
 const {actionCreators: ac, actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
 const {Prefs} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamPrefs.jsm", {});
 const {PrerenderData} = ChromeUtils.import("resource://activity-stream/common/PrerenderData.jsm", {});
+const {INITIAL_STATE} = ChromeUtils.import("resource://activity-stream/common/Reducers.jsm", {});
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
@@ -32,12 +33,13 @@ this.PrefsFeed = class PrefsFeed {
     this._prefs = new Prefs();
   }
 
-  // If any of the prefs are set to something other than what the
+  // If any prefs or the theme are set to something other than what the
   // prerendered version of AS expects, we can't use it.
-  async _setPrerenderPref() {
+  async _setPrerenderPref(theme) {
     const indexedDBPrefs = await this._storage.getAll();
     const prefsAreValid = PrerenderData.arePrefsValid(pref => this._prefs.get(pref), indexedDBPrefs);
-    this._prefs.set("prerender", prefsAreValid);
+    const themeIsDefault = (theme || this.store.getState().Theme).className === INITIAL_STATE.Theme.className;
+    this._prefs.set("prerender", prefsAreValid && themeIsDefault);
   }
 
   _checkPrerender(name) {
@@ -135,6 +137,9 @@ this.PrefsFeed = class PrefsFeed {
       case at.SET_PREF:
         this._prefs.set(action.data.name, action.data.value);
         break;
+      case at.THEME_UPDATE:
+        this._setPrerenderPref(action.data);
+        break;
       case at.DISABLE_ONBOARDING:
         this.setOnboardingDisabledDefault(true);
         break;

browser/extensions/activity-stream/lib/ThemeFeed.jsm

@@ -0,0 +1,54 @@
+/* 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/. */
+"use strict";
+
+ChromeUtils.import("resource://gre/modules/LightweightThemeManager.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+const {actionCreators: ac, actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
+
+const THEME_UPDATE_EVENT = "lightweight-theme-styling-update";
+
+this.ThemeFeed = class ThemeFeed {
+  init() {
+    Services.obs.addObserver(this, THEME_UPDATE_EVENT);
+    this.updateTheme(LightweightThemeManager.currentThemeForDisplay);
+  }
+
+  uninit() {
+    Services.obs.removeObserver(this, THEME_UPDATE_EVENT);
+  }
+
+  observe(subject, topic, data) {
+    if (topic === THEME_UPDATE_EVENT) {
+      this.updateTheme(JSON.parse(data));
+    }
+  }
+
+  updateTheme(data) {
+    if (data && data.window) {
+      // We only update newtab theme if the theme activated isn't window specific.
+      // We'll be able to do better in the future: see Bug 1444459
+      return;
+    }
+
+    // If the theme is the built-in Dark theme, then activate our dark theme.
+    const isDarkTheme = data && data.id === "firefox-compact-dark@mozilla.org";
+    const className = isDarkTheme ? "dark-theme" : "";
+    this.store.dispatch(ac.BroadcastToContent({type: at.THEME_UPDATE, data: {className}}));
+  }
+
+  onAction(action) {
+    switch (action.type) {
+      case at.INIT:
+        this.init();
+        break;
+      case at.UNINIT:
+        this.uninit();
+        break;
+    }
+  }
+};
+
+const EXPORTED_SYMBOLS = ["ThemeFeed", "THEME_UPDATE_EVENT"];

browser/extensions/activity-stream/prerendered/locales/ach/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/ach/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/an/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/an/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/ar/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/ar/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/ast/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/ast/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/az/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/az/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/be/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/be/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/bg/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/bg/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/bn-BD/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/bn-BD/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/bn-IN/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/bn-IN/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/br/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/br/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/bs/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/bs/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/ca/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/ca/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/cak/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/cak/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/crh/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/crh/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/cs/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/cs/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/cy/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/cy/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/da/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/da/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/de/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/de/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/dsb/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/dsb/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/el/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/el/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/en-CA/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/en-CA/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/en-GB/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/en-GB/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/en-US/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/en-US/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/eo/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/eo/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/es-AR/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/es-AR/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/es-CL/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/es-CL/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/es-ES/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/es-ES/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/es-MX/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/es-MX/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/et/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/et/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/eu/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/eu/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/fa/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/fa/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/ff/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/ff/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/fi/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/fi/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/fr/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/fr/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/fy-NL/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/fy-NL/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/ga-IE/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/ga-IE/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/gd/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/gd/activity-stream.html

@@ -18,7 +18,6 @@
 // finish loading to render the content sooner.
 for (const src of [
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",

browser/extensions/activity-stream/prerendered/locales/gl/activity-stream-prerendered.html

@@ -19,7 +19,6 @@
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
-  "chrome://browser/content/contentTheme.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
   "resource://activity-stream/vendor/prop-types.js",