summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/generated_resources.grd6
-rw-r--r--chrome/browser/about_flags.cc7
-rw-r--r--chrome/browser/browser_resources.grd1
-rw-r--r--chrome/browser/resources/backloader/background.html5
-rw-r--r--chrome/browser/resources/backloader/manifest.json16
-rw-r--r--chrome/browser/resources/backloader/scripts/background.js145
-rw-r--r--chrome/browser/resources/backloader/scripts/pages.js13
-rw-r--r--chrome/browser/resources/backloader/web/cros_validator.js48
-rw-r--r--chrome/browser/resources/component_extension_resources.grd6
-rw-r--r--chromeos/chromeos_switches.cc4
-rw-r--r--chromeos/chromeos_switches.h1
11 files changed, 0 insertions, 252 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 9b967cb..c956a68 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5695,12 +5695,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_DISABLE_COMPOSITOR_TOUCH_HIT_TESTING_DESCRIPTION" desc="Description of the disable compositor touch hit testing flags.">
Disables an optimization intended to improve touch scrolling responsiveness. Forces all touch events to go to the blink main thread to look for handlers, instead of potentially short-circuiting from the compositor thread.
</message>
- <message name="IDS_ENABLE_BACKLOADER_NAME" desc="Title of the enable background loader flag." >
- Enable background loader component for hosted applications
- </message>
- <message name="IDS_ENABLE_BACKLOADER_DESCRIPTION" desc="Description of the enable background loader flag.">
- Enable background loader component for hosted applications.
- </message>
<message name="IDS_FLAGS_CONFLICTS_CHECK_NAME" desc="Title of the run conflicts check flag">
Check for known conflicts with 3rd party modules.
</message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index b8e1c90..c7ee9e8 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -943,13 +943,6 @@ const Experiment kExperiments[] = {
SINGLE_VALUE_TYPE(ash::switches::kAshDisableDragOffShelf)
},
{
- "enable-background-loader",
- IDS_ENABLE_BACKLOADER_NAME,
- IDS_ENABLE_BACKLOADER_DESCRIPTION,
- kOsCrOS,
- SINGLE_VALUE_TYPE(chromeos::switches::kEnableBackgroundLoader)
- },
- {
"ash-disable-docked-windows",
IDS_FLAGS_DOCKED_WINDOWS_NAME,
IDS_FLAGS_DOCKED_WINDOWS_DESCRIPTION,
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index e3c61a8..502ab73 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -295,7 +295,6 @@
<include name="IDR_GAIA_AUTH_SAML_MANIFEST" file="resources\gaia_auth\manifest_saml.json" type="BINDATA" />
<include name="IDR_GAIA_AUTH_DESKTOP_MANIFEST" file="resources\gaia_auth\manifest_desktop.json" type="BINDATA" />
<if expr="chromeos">
- <include name="IDR_BACKLOADER_MANIFEST" file="resources\backloader\manifest.json" type="BINDATA" />
<include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\choose_mobile_network.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_CHOOSE_MOBILE_NETWORK_JS" file="resources\chromeos\choose_mobile_network.js" type="BINDATA" />
<include name="IDR_CROSH_BUILTIN_MANIFEST" file="resources\chromeos\crosh_builtin\manifest.json" type="BINDATA" />
diff --git a/chrome/browser/resources/backloader/background.html b/chrome/browser/resources/backloader/background.html
deleted file mode 100644
index 8121f47..0000000
--- a/chrome/browser/resources/backloader/background.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<script src="scripts/pages.js"></script>
-<script src="scripts/background.js"></script>
-<body></body>
-</html>
diff --git a/chrome/browser/resources/backloader/manifest.json b/chrome/browser/resources/backloader/manifest.json
deleted file mode 100644
index 9b070fa..0000000
--- a/chrome/browser/resources/backloader/manifest.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- // chrome-extension://nbicjcbcmclhihdkigkjgkgafckdfcom/
- "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdAyOMD6dFIHl3e7VQcmhFFoX/ha4XI+bQ+eOAa8KPg1eZJgNfuV2LzLw+CJw0gp/UfjdiV/z1yV7+W72WSnoFaXTGLcDMne0rDp4oabUxvGwpPChJFJf0TGgXlLG6Nuf3IYp/ShdWqXFETPXn9E0ESAkre6vn5su/VYWossTmVQIDAQAB",
- "name": "BackLoaderExtension",
- "version": "1.0",
- "manifest_version": 2,
- "description": "Background page loader for selected hosted apps",
- "background": {
- "persistent": false,
- "page": "background.html"
- },
- "permissions": [
- "alarms",
- "management"
- ]
-}
diff --git a/chrome/browser/resources/backloader/scripts/background.js b/chrome/browser/resources/backloader/scripts/background.js
deleted file mode 100644
index 451702e..0000000
--- a/chrome/browser/resources/backloader/scripts/background.js
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-function Loader(pages) {
- this.pages_ = pages;
- this.pagesLoaded_ = false;
- this.loadedCount_ = false;
-}
-
-// Global instance.
-Loader.instance_ = null;
-
-// static.
-Loader.getInstance = function() {
- if (!Loader.instance_) {
- if (!g_pages)
- console.log('Warning: Undefined g_pages.');
- Loader.instance_ = new Loader(g_pages);
- }
-
- return Loader.instance_;
-};
-
-Loader.prototype = {
- // Alarm name.
- ALARM_NAME: 'CrOSBkgLoaderAlarm',
-
- // Initial delay.
- DELAY_IN_MINUTES: 1,
-
- // Periodic wakeup delay.
- PERIOD_IN_MINUTES: 60,
-
- // Delayed closing of the background page once when all iframes are loaded.
- maxDelayMS_: 10000,
-
- // Loader start up. Kicks off alarm initialization if needed.
- initialize: function() {
- if (!g_pages || !g_pages.length) {
- window.close();
- return;
- }
-
- chrome.alarms.onAlarm.addListener(this.onAlarm_.bind(this));
- // Check if this alarm already exists, if not then create it.
- chrome.alarms.get(this.ALARM_NAME, function(alarm) {
- if (!alarm) {
- chrome.alarms.create(this.ALARM_NAME,
- {delayInMinutes: this.DELAY_IN_MINUTES});
- window.close();
- return;
- }
- }.bind(this));
- },
-
- onAlarm_: function(alarm) {
- if (alarm.name != this.ALARM_NAME)
- return;
-
- this.preparePages_();
- },
-
- onMessage_: function(event) {
- var msg = event.data;
- if (msg.method == 'validate') {
- var replyMsg = {
- method: 'validationResults',
- os: 'ChromeOS'
- };
- event.source.postMessage(replyMsg, event.origin);
- } else {
- console.log('#### Loader.onMessage_: unknown message');
- }
- },
-
- // Find an extension in the |list| with matching extension |id|.
- getExtensionById_: function(list, id) {
- for (var i = 0; i < list.length; i++) {
- if (list[i].id == id)
- return list[i];
- }
- return null;
- },
-
- preparePages_: function() {
- if (this.pagesLoaded_)
- return;
-
- window.addEventListener('message', this.onMessage_.bind(this), false);
- chrome.management.getAll(function(list) {
- // Get total count first.
- var pagesToLoad = [];
- for (var i = 0; i < this.pages_.length; i++) {
- var page = this.pages_[i];
- if (page.oneTime && page.initialized)
- continue;
-
- var extension = this.getExtensionById_(list, page.extensionId);
- if (!extension || !extension.enabled) {
- page.initialized = true;
- continue;
- }
-
- page.initialized = true;
- if (page.unloadDelayMS > this.maxDelayMS_)
- this.maxDelayMS_ = page.unloadDelayMS;
-
- pagesToLoad.push(page);
- }
- this.loadFrames_(pagesToLoad);
- this.pagesLoaded_ = true;
- }.bind(this));
- },
-
- loadFrames_: function(pages) {
- this.load_target_ = pages.length;
- for (var i = 0; i < pages.length; i++) {
- this.loadLuncherFrame_(i, pages[i].pageUrl);
- }
- },
-
- incrementLoadCounter_: function() {
- this.loadedCount_++;
- if (this.loadedCount_ < this.load_target_)
- return;
-
- // Delay closing.
- setInterval(function() {
- window.close();
- }.bind(this), this.maxDelayMS_);
- },
-
- loadLuncherFrame_: function(index, pageUrl) {
- var iframe = document.createElement('iframe');
- iframe.onload = function() {
- this.incrementLoadCounter_();
- }.bind(this);
- iframe.src = pageUrl;
- iframe.name = 'frame_' + index;
- document.body.appendChild(iframe);
- }
-};
-
-Loader.getInstance().initialize();
diff --git a/chrome/browser/resources/backloader/scripts/pages.js b/chrome/browser/resources/backloader/scripts/pages.js
deleted file mode 100644
index 3a3f23c..0000000
--- a/chrome/browser/resources/backloader/scripts/pages.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// List of pages to load in the background.
-var g_pages = [
- {
- extension_id: 'ejjicmeblgpmajnghnpcppodonldlgfn',
- pageUrl: 'https://www.google.com/calendar/offline/background.html',
- oneTime: true,
- unloadDelayMS: 10000
- }
-];
diff --git a/chrome/browser/resources/backloader/web/cros_validator.js b/chrome/browser/resources/backloader/web/cros_validator.js
deleted file mode 100644
index b849fcf..0000000
--- a/chrome/browser/resources/backloader/web/cros_validator.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-function ChromeOSValidator() {
-}
-
-ChromeOSValidator.getInstance = function() {
- if (!ChromeOSValidator.instance_) {
- ChromeOSValidator.instance_ = new ChromeOSValidator();
- }
- return ChromeOSValidator.instance_;
-};
-
-ChromeOSValidator.prototype = {
- LOADER_ORIGIN: 'chrome-extension://nbicjcbcmclhihdkigkjgkgafckdfcom',
- LOADER_PAGE: '/background.html',
- callback_: undefined,
-
- validate: function(callback) {
- this.callback_ = callback;
- var msg = { method: 'validate' };
- window.parent.postMessage(msg,
- this.LOADER_ORIGIN + this.LOADER_PAGE);
- },
-
- initialize: function() {
- window.addEventListener('message', this.onMessage.bind(this), false);
- },
-
- isValidMessage_: function(msg) {
- return msg.origin == this.LOADER_ORIGIN;
- },
-
- onMessage: function(e) {
- var msg = e.data;
- if (msg.method == 'validationResults' && this.isValidMessage_(e)) {
- if (this.callback_)
- this.callback_(msg.os == 'ChromeOS');
- } else {
- console.log('#### ChromeOSValidator.onMessage: unknown message');
- if (this.callback_)
- this.callback_(false);
- }
- }
-};
-
-ChromeOSValidator.getInstance().initialize();
diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome/browser/resources/component_extension_resources.grd
index b390f24..0664120 100644
--- a/chrome/browser/resources/component_extension_resources.grd
+++ b/chrome/browser/resources/component_extension_resources.grd
@@ -71,12 +71,6 @@
<include name="IDR_HOTWORD_HELPER_AUDIO_CLIENT_JS" file="hotword_helper/audio_client.js" type="BINDATA" />
<include name="IDR_HOTWORD_HELPER_OPTIN_CLIENT_JS" file="hotword_helper/optin_client.js" type="BINDATA" />
<include name="IDR_HOTWORD_HELPER_MANAGER_JS" file="hotword_helper/manager.js" type="BINDATA" />
- <if expr="chromeos">
- <!-- Background page loader -->
- <include name="IDR_BACKLOADER_BACKGROUND_HTML" file="backloader/background.html" type="BINDATA" />
- <include name="IDR_BACKLOADER_BACKGROUND_JS" file="backloader/scripts/background.js" type="BINDATA" />
- <include name="IDR_BACKLOADER_PAGES_JS" file="backloader/scripts/pages.js" type="BINDATA" />
- </if>
<include name="IDR_FEEDBACK_DEFAULT_HTML" file="feedback/html/default.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_FEEDBACK_EVENT_HANDLER_JS" file="feedback/js/event_handler.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_FEEDBACK_FEEDBACK_JS" file="feedback/js/feedback.js" flattenhtml="true" type="BINDATA" />
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
index 68ce454..cb862c9 100644
--- a/chromeos/chromeos_switches.cc
+++ b/chromeos/chromeos_switches.cc
@@ -76,10 +76,6 @@ const char kDisableOOBEBlockingUpdate[] =
// Useful for testing.
const char kEchoExtensionPath[] = "echo-ext-path";
-// Enables component extension that initializes background pages of
-// certain hosted applications.
-const char kEnableBackgroundLoader[] = "enable-background-loader";
-
// Enables switching between different cellular carriers from the UI.
const char kEnableCarrierSwitching[] = "enable-carrier-switching";
diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
index b4a761b..f8b928b 100644
--- a/chromeos/chromeos_switches.h
+++ b/chromeos/chromeos_switches.h
@@ -40,7 +40,6 @@ CHROMEOS_EXPORT extern const char kDisableOobeAnimation[];
CHROMEOS_EXPORT extern const char kDisableQuickofficeComponentApp[];
CHROMEOS_EXPORT extern const char kDisableVolumeAdjustSound[];
CHROMEOS_EXPORT extern const char kEchoExtensionPath[];
-CHROMEOS_EXPORT extern const char kEnableBackgroundLoader[];
CHROMEOS_EXPORT extern const char kEnableCarrierSwitching[];
CHROMEOS_EXPORT extern const char kEnableKioskMode[];
CHROMEOS_EXPORT extern const char kEnableNetworkPortalNotification[];
generated by cgit v1.1 at 2025-02-09 07:16:43 +0000