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

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 11734038: Fix compile from bad merge :( (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 12 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 9552ee401c27dca1c19c5382973cdfb187d0c650..8dfec412aed87056d4b4900ed6e4dd58054bad5f 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -804,11 +804,6 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins"));
#endif
-#endif // defined(ENABLE_PLUGINS)
-
- if (local_state()->IsManagedPreference(prefs::kDefaultBrowserSettingEnabled))
- ApplyDefaultBrowserPolicy();
-
// Triggers initialization of the singleton instance on UI thread.
PluginFinder::GetInstance()->Init();
@@ -817,6 +812,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
plugins_resource_service_ = new PluginsResourceService(local_state());
plugins_resource_service_->StartAfterDelay();
#endif
+#endif // defined(ENABLE_PLUGINS)
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
if (!command_line.HasSwitch(switches::kDisableWebResources)) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698