OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/browser_process_impl.h" | 5 #include "chrome/browser/browser_process_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <map> | 9 #include <map> |
10 #include <utility> | 10 #include <utility> |
(...skipping 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1015 if (local_state_->IsManagedPreference(prefs::kDefaultBrowserSettingEnabled)) | 1015 if (local_state_->IsManagedPreference(prefs::kDefaultBrowserSettingEnabled)) |
1016 ApplyDefaultBrowserPolicy(); | 1016 ApplyDefaultBrowserPolicy(); |
1017 | 1017 |
1018 #if !defined(OS_ANDROID) | 1018 #if !defined(OS_ANDROID) |
1019 ApplyMetricsReportingPolicy(); | 1019 ApplyMetricsReportingPolicy(); |
1020 #endif | 1020 #endif |
1021 | 1021 |
1022 #if defined(ENABLE_PLUGINS) | 1022 #if defined(ENABLE_PLUGINS) |
1023 PluginService* plugin_service = PluginService::GetInstance(); | 1023 PluginService* plugin_service = PluginService::GetInstance(); |
1024 plugin_service->SetFilter(ChromePluginServiceFilter::GetInstance()); | 1024 plugin_service->SetFilter(ChromePluginServiceFilter::GetInstance()); |
1025 plugin_service->StartWatchingPlugins(); | |
1026 | |
1027 #if defined(OS_POSIX) | |
1028 // Also find plugins in a user-specific plugins dir, | |
1029 // e.g. ~/.config/chromium/Plugins. | |
1030 const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess(); | |
1031 if (!cmd_line.HasSwitch(switches::kDisablePluginsDiscovery)) { | |
1032 base::FilePath user_data_dir; | |
1033 if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) | |
1034 plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins")); | |
1035 } | |
1036 #endif | |
1037 | 1025 |
1038 // Triggers initialization of the singleton instance on UI thread. | 1026 // Triggers initialization of the singleton instance on UI thread. |
1039 PluginFinder::GetInstance()->Init(); | 1027 PluginFinder::GetInstance()->Init(); |
1040 | 1028 |
1041 #if defined(ENABLE_PLUGIN_INSTALLATION) | 1029 #if defined(ENABLE_PLUGIN_INSTALLATION) |
1042 DCHECK(!plugins_resource_service_.get()); | 1030 DCHECK(!plugins_resource_service_.get()); |
1043 plugins_resource_service_.reset(new PluginsResourceService(local_state())); | 1031 plugins_resource_service_.reset(new PluginsResourceService(local_state())); |
1044 plugins_resource_service_->Init(); | 1032 plugins_resource_service_->Init(); |
1045 #endif | 1033 #endif |
1046 #endif // defined(ENABLE_PLUGINS) | 1034 #endif // defined(ENABLE_PLUGINS) |
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1297 } | 1285 } |
1298 | 1286 |
1299 void BrowserProcessImpl::OnAutoupdateTimer() { | 1287 void BrowserProcessImpl::OnAutoupdateTimer() { |
1300 if (CanAutorestartForUpdate()) { | 1288 if (CanAutorestartForUpdate()) { |
1301 DLOG(WARNING) << "Detected update. Restarting browser."; | 1289 DLOG(WARNING) << "Detected update. Restarting browser."; |
1302 RestartBackgroundInstance(); | 1290 RestartBackgroundInstance(); |
1303 } | 1291 } |
1304 } | 1292 } |
1305 | 1293 |
1306 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1294 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |