| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 797 plugin_service->StartWatchingPlugins(); | 797 plugin_service->StartWatchingPlugins(); |
| 798 | 798 |
| 799 #if defined(OS_POSIX) | 799 #if defined(OS_POSIX) |
| 800 // Also find plugins in a user-specific plugins dir, | 800 // Also find plugins in a user-specific plugins dir, |
| 801 // e.g. ~/.config/chromium/Plugins. | 801 // e.g. ~/.config/chromium/Plugins. |
| 802 FilePath user_data_dir; | 802 FilePath user_data_dir; |
| 803 if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) | 803 if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) |
| 804 plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins")); | 804 plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins")); |
| 805 #endif | 805 #endif |
| 806 | 806 |
| 807 #endif // defined(ENABLE_PLUGINS) | |
| 808 | |
| 809 if (local_state()->IsManagedPreference(prefs::kDefaultBrowserSettingEnabled)) | |
| 810 ApplyDefaultBrowserPolicy(); | |
| 811 | |
| 812 // Triggers initialization of the singleton instance on UI thread. | 807 // Triggers initialization of the singleton instance on UI thread. |
| 813 PluginFinder::GetInstance()->Init(); | 808 PluginFinder::GetInstance()->Init(); |
| 814 | 809 |
| 815 #if defined(ENABLE_PLUGIN_INSTALLATION) | 810 #if defined(ENABLE_PLUGIN_INSTALLATION) |
| 816 DCHECK(!plugins_resource_service_.get()); | 811 DCHECK(!plugins_resource_service_.get()); |
| 817 plugins_resource_service_ = new PluginsResourceService(local_state()); | 812 plugins_resource_service_ = new PluginsResourceService(local_state()); |
| 818 plugins_resource_service_->StartAfterDelay(); | 813 plugins_resource_service_->StartAfterDelay(); |
| 819 #endif | 814 #endif |
| 815 #endif // defined(ENABLE_PLUGINS) |
| 820 | 816 |
| 821 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 817 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
| 822 if (!command_line.HasSwitch(switches::kDisableWebResources)) { | 818 if (!command_line.HasSwitch(switches::kDisableWebResources)) { |
| 823 DCHECK(!promo_resource_service_.get()); | 819 DCHECK(!promo_resource_service_.get()); |
| 824 promo_resource_service_ = new PromoResourceService; | 820 promo_resource_service_ = new PromoResourceService; |
| 825 promo_resource_service_->StartAfterDelay(); | 821 promo_resource_service_->StartAfterDelay(); |
| 826 } | 822 } |
| 827 | 823 |
| 828 #if !defined(OS_ANDROID) | 824 #if !defined(OS_ANDROID) |
| 829 if (browser_defaults::bookmarks_enabled && | 825 if (browser_defaults::bookmarks_enabled && |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 972 } | 968 } |
| 973 | 969 |
| 974 void BrowserProcessImpl::OnAutoupdateTimer() { | 970 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 975 if (CanAutorestartForUpdate()) { | 971 if (CanAutorestartForUpdate()) { |
| 976 DLOG(WARNING) << "Detected update. Restarting browser."; | 972 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 977 RestartBackgroundInstance(); | 973 RestartBackgroundInstance(); |
| 978 } | 974 } |
| 979 } | 975 } |
| 980 | 976 |
| 981 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 977 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |