Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1065)

Unified Diff: chrome/browser/extensions/chrome_extensions_browser_client.cc

Issue 345693002: Extensions: Split extensions utility IPC messages into its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/chrome_extensions_browser_client.cc
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
index 938ca2971e91742f99c134585717b2bff65a824f..398b93c981c7dda8e8e4190d8e02faabedfdd243 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -11,6 +11,8 @@
#include "chrome/browser/app_mode/app_mode_utils.h"
#include "chrome/browser/browser_process.h"
#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/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"
@@ -39,17 +41,10 @@
#include "chromeos/chromeos_switches.h"
#endif
-#if defined(ENABLE_EXTENSIONS)
-#include "chrome/browser/extensions/api/chrome_extensions_api_client.h"
-#include "chrome/browser/extensions/api/content_settings/content_settings_service.h"
-#endif
-
namespace extensions {
ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() {
-#if defined(ENABLE_EXTENSIONS)
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());
@@ -153,9 +148,7 @@ PrefService* ChromeExtensionsBrowserClient::GetPrefServiceForContext(
void ChromeExtensionsBrowserClient::GetEarlyExtensionPrefsObservers(
content::BrowserContext* context,
std::vector<ExtensionPrefsObserver*>* observers) const {
-#if defined(ENABLE_EXTENSIONS)
observers->push_back(ContentSettingsService::Get(context));
-#endif
}
bool ChromeExtensionsBrowserClient::DeferLoadingBackgroundHosts(
@@ -168,14 +161,10 @@ bool ChromeExtensionsBrowserClient::DeferLoadingBackgroundHosts(
if (!g_browser_process->profile_manager()->IsValidProfile(profile))
return true;
-#if defined(OS_ANDROID)
- return false;
-#else
// 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(
@@ -246,10 +235,6 @@ ChromeExtensionsBrowserClient::GetExtensionSystemFactory() {
void ChromeExtensionsBrowserClient::RegisterExtensionFunctions(
ExtensionFunctionRegistry* registry) const {
-// TODO(rockot): Figure out if and why Android really needs to build
-// ChromeExtensionsBrowserClient and refactor so this ifdef isn't necessary.
-// See http://crbug.com/349436
-#if defined(ENABLE_EXTENSIONS)
// Preferences.
registry->RegisterFunction<extensions::GetPreferenceFunction>();
registry->RegisterFunction<extensions::SetPreferenceFunction>();
@@ -269,7 +254,6 @@ void ChromeExtensionsBrowserClient::RegisterExtensionFunctions(
// Generated APIs from Chrome.
extensions::api::GeneratedFunctionRegistry::RegisterAll(registry);
-#endif
}
ComponentExtensionResourceManager*

Powered by Google App Engine
This is Rietveld 408576698