summaryrefslogtreecommitdiffstats
path: root/apps/shell/browser/shell_extensions_browser_client.cc
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-17 17:21:45 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-17 17:21:45 +0000
commit46a19f626f5794f298cd1e4d8bdcbfcb07fd0b4e (patch)
tree5a04abc6c4c823a4ddf1ca0d76fcc1ea47ff009a /apps/shell/browser/shell_extensions_browser_client.cc
parentdddea5bb5ab70ac91118754eb09ccb30dcb178a2 (diff)
downloadchromium_src-46a19f626f5794f298cd1e4d8bdcbfcb07fd0b4e.zip
chromium_src-46a19f626f5794f298cd1e4d8bdcbfcb07fd0b4e.tar.gz
chromium_src-46a19f626f5794f298cd1e4d8bdcbfcb07fd0b4e.tar.bz2
Revert 283678 "Refactor code that defers extension background pa..."
This broke Chrome OS valgrind bots, for example: http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20OS%20%28valgrind%29%284%29/builds/27033 > Refactor code that defers extension background page loading > > src/extensions depends on chrome::NOTIFICATION_PROFILE_CREATED to support deferred loading of extension background pages when the profile isn't ready yet. This is a layering violation. > > * Remove Chrome concepts like "browser window ready" and "profile created" from ProcessManager. Introduce ProcessManagerDelegate with a general concept of deferring background page loading. > * Consolidate all the tricky Chrome-specific background page loading rules into ChromeProcessManagerDelegate. This keeps all the rules in one place. Annotate each block of special case code with the bug that inspired it. > * Extend unit test coverage for ProcessManager. > > This will make it easier to eliminate chrome::NOTIFICATION_PROFILE_DESTROYED in ProcessManager in a later CL. > > BUG=392658 > TEST=unit_tests ProcessManagerTest, browser_tests ProcessManagerBrowserTest, manual > > Review URL: https://codereview.chromium.org/381283002 TBR=jamescook@chromium.org Review URL: https://codereview.chromium.org/399153002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/shell/browser/shell_extensions_browser_client.cc')
-rw-r--r--apps/shell/browser/shell_extensions_browser_client.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/apps/shell/browser/shell_extensions_browser_client.cc b/apps/shell/browser/shell_extensions_browser_client.cc
index 54b0df8..76f4a83 100644
--- a/apps/shell/browser/shell_extensions_browser_client.cc
+++ b/apps/shell/browser/shell_extensions_browser_client.cc
@@ -183,9 +183,14 @@ void ShellExtensionsBrowserClient::GetEarlyExtensionPrefsObservers(
content::BrowserContext* context,
std::vector<ExtensionPrefsObserver*>* observers) const {}
-ProcessManagerDelegate*
-ShellExtensionsBrowserClient::GetProcessManagerDelegate() const {
- return NULL;
+bool ShellExtensionsBrowserClient::DeferLoadingBackgroundHosts(
+ BrowserContext* context) const {
+ return false;
+}
+
+bool ShellExtensionsBrowserClient::IsBackgroundPageAllowed(
+ BrowserContext* context) const {
+ return true;
}
scoped_ptr<ExtensionHostDelegate>