Revert 283678 "Refactor code that defers extension background pa..."

trunk/src/chrome/browser/extensions/chrome_extensions_browser_client.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/extensions/chrome_extensions_browser_client.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/version.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/preference/chrome_direct_setting.h"
 #include "chrome/browser/extensions/api/preference/preference_api.h"
 #include "chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.h"
 #include "chrome/browser/extensions/chrome_app_sorting.h"
 #include "chrome/browser/extensions/chrome_component_extension_resource_manager.h"
 #include "chrome/browser/extensions/chrome_extension_host_delegate.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/url_request_util.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/browser_finder.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/api/generated_api.h"
 #include "chrome/common/extensions/features/feature_channel.h"
 #include "chrome/common/pref_names.h"
 #include "extensions/browser/extension_function_registry.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/pref_names.h"
 #include "extensions/common/api/generated_api.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/chromeos_switches.h"
 #endif
 
 // TODO(thestig): Remove this when extensions are fully removed on mobile.
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/api/chrome_extensions_api_client.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_service.h"
-#include "chrome/browser/extensions/chrome_process_manager_delegate.h"
 #endif
 
 namespace extensions {
 
 ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() {
 #if defined(ENABLE_EXTENSIONS)
-  process_manager_delegate_.reset(new ChromeProcessManagerDelegate);
   api_client_.reset(new ChromeExtensionsAPIClient);
 #endif
   // Only set if it hasn't already been set (e.g. by a test).
   if (GetCurrentChannel() == GetDefaultChannel())
     SetCurrentChannel(chrome::VersionInfo::GetChannel());
 }
 
 ChromeExtensionsBrowserClient::~ChromeExtensionsBrowserClient() {}
 
 bool ChromeExtensionsBrowserClient::IsShuttingDown() {
@@ skipping 90 matching lines @@
 }
 
 void ChromeExtensionsBrowserClient::GetEarlyExtensionPrefsObservers(
     content::BrowserContext* context,
     std::vector<ExtensionPrefsObserver*>* observers) const {
 #if defined(ENABLE_EXTENSIONS)
   observers->push_back(ContentSettingsService::Get(context));
 #endif
 }
 
-ProcessManagerDelegate*
-ChromeExtensionsBrowserClient::GetProcessManagerDelegate() const {
-#if defined(ENABLE_EXTENSIONS)
-  return process_manager_delegate_.get();
+bool ChromeExtensionsBrowserClient::DeferLoadingBackgroundHosts(
+    content::BrowserContext* context) const {
+  Profile* profile = static_cast<Profile*>(context);
+
+  // The profile may not be valid yet if it is still being initialized.
+  // In that case, defer loading, since it depends on an initialized profile.
+  // http://crbug.com/222473
+  if (!g_browser_process->profile_manager()->IsValidProfile(profile))
+    return true;
+
+#if defined(OS_ANDROID)
+  return false;
 #else
-  return NULL;
+  // There are no browser windows open and the browser process was
+  // started to show the app launcher.
+  return chrome::GetTotalBrowserCountForProfile(profile) == 0 &&
+         CommandLine::ForCurrentProcess()->HasSwitch(switches::kShowAppList);
 #endif
 }
 
+bool ChromeExtensionsBrowserClient::IsBackgroundPageAllowed(
+    content::BrowserContext* context) const {
+  // Returns true if current session is Guest mode session and current
+  // browser context is *not* off-the-record. Such context is artificial and
+  // background page shouldn't be created in it.
+  return !static_cast<Profile*>(context)->IsGuestSession() ||
+         context->IsOffTheRecord();
+}
+
 scoped_ptr<ExtensionHostDelegate>
 ChromeExtensionsBrowserClient::CreateExtensionHostDelegate() {
   return scoped_ptr<ExtensionHostDelegate>(new ChromeExtensionHostDelegate);
 }
 
 bool ChromeExtensionsBrowserClient::DidVersionUpdate(
     content::BrowserContext* context) {
   Profile* profile = static_cast<Profile*>(context);
 
   // Unit tests may not provide prefs; assume everything is up-to-date.
@@ skipping 87 matching lines @@
     content::BrowserContext* context) const {
 #if defined(ENABLE_EXTENSIONS)
   return scoped_ptr<extensions::RuntimeAPIDelegate>(
       new ChromeRuntimeAPIDelegate(context));
 #else
   return scoped_ptr<extensions::RuntimeAPIDelegate>();
 #endif
 }
 
 }  // namespace extensions