Index: chrome/browser/browser_process_impl.cc |
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc |
index 7bb57d0a2b7c4d911cba2961727409ff307b4769..87bf7c0c354c6e558ee6e0a50813091fa54d95e3 100644 |
--- a/chrome/browser/browser_process_impl.cc |
+++ b/chrome/browser/browser_process_impl.cc |
@@ -784,6 +784,7 @@ void BrowserProcessImpl::PreCreateThreads() { |
} |
void BrowserProcessImpl::PreMainMessageLoopRun() { |
+#if defined(ENABLE_PLUGINS) |
PluginService* plugin_service = PluginService::GetInstance(); |
plugin_service->SetFilter(ChromePluginServiceFilter::GetInstance()); |
plugin_service->StartWatchingPlugins(); |
@@ -816,18 +817,19 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { |
} |
#endif |
- if (local_state_->IsManagedPreference(prefs::kDefaultBrowserSettingEnabled)) |
- ApplyDefaultBrowserPolicy(); |
- |
- // Triggers initialization of the singleton instance on UI thread. |
- PluginFinder::GetInstance()->Init(); |
- |
#if defined(ENABLE_PLUGIN_INSTALLATION) |
if (!plugins_resource_service_) { |
plugins_resource_service_ = new PluginsResourceService(local_state()); |
plugins_resource_service_->StartAfterDelay(); |
} |
#endif |
+#endif // defined(ENABLE_PLUGINS) |
+ |
+ if (local_state_->IsManagedPreference(prefs::kDefaultBrowserSettingEnabled)) |
+ ApplyDefaultBrowserPolicy(); |
+ |
+ // Triggers initialization of the singleton instance on UI thread. |
+ PluginFinder::GetInstance()->Init(); |
stuartmorgan
2012/12/19 12:53:58
Are you sure the ordering here wasn't important?
nilesh
2012/12/19 21:07:44
Actually I am not sure. I am moving it back as it
|
#if !defined(OS_ANDROID) |
if (browser_defaults::bookmarks_enabled && |