| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 #include "chrome/browser/printing/print_preview_tab_controller.h" | 49 #include "chrome/browser/printing/print_preview_tab_controller.h" |
| 50 #include "chrome/browser/profiles/profile_manager.h" | 50 #include "chrome/browser/profiles/profile_manager.h" |
| 51 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.
h" | 51 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.
h" |
| 52 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 52 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 53 #include "chrome/browser/shell_integration.h" | 53 #include "chrome/browser/shell_integration.h" |
| 54 #include "chrome/browser/sidebar/sidebar_manager.h" | 54 #include "chrome/browser/sidebar/sidebar_manager.h" |
| 55 #include "chrome/browser/status_icons/status_tray.h" | 55 #include "chrome/browser/status_icons/status_tray.h" |
| 56 #include "chrome/browser/tab_closeable_state_watcher.h" | 56 #include "chrome/browser/tab_closeable_state_watcher.h" |
| 57 #include "chrome/browser/tab_contents/thumbnail_generator.h" | 57 #include "chrome/browser/tab_contents/thumbnail_generator.h" |
| 58 #include "chrome/browser/ui/browser_list.h" | 58 #include "chrome/browser/ui/browser_list.h" |
| 59 #include "chrome/browser/web_resource/gpu_blacklist_updater.h" | |
| 60 #include "chrome/common/chrome_constants.h" | 59 #include "chrome/common/chrome_constants.h" |
| 61 #include "chrome/common/chrome_notification_types.h" | 60 #include "chrome/common/chrome_notification_types.h" |
| 62 #include "chrome/common/chrome_paths.h" | 61 #include "chrome/common/chrome_paths.h" |
| 63 #include "chrome/common/chrome_switches.h" | 62 #include "chrome/common/chrome_switches.h" |
| 64 #include "chrome/common/extensions/extension_l10n_util.h" | 63 #include "chrome/common/extensions/extension_l10n_util.h" |
| 65 #include "chrome/common/extensions/extension_resource.h" | 64 #include "chrome/common/extensions/extension_resource.h" |
| 66 #include "chrome/common/json_pref_store.h" | 65 #include "chrome/common/json_pref_store.h" |
| 67 #include "chrome/common/pref_names.h" | 66 #include "chrome/common/pref_names.h" |
| 68 #include "chrome/common/switch_utils.h" | 67 #include "chrome/common/switch_utils.h" |
| 69 #include "chrome/common/url_constants.h" | 68 #include "chrome/common/url_constants.h" |
| (...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 689 return prerender_tracker_.get(); | 688 return prerender_tracker_.get(); |
| 690 } | 689 } |
| 691 | 690 |
| 692 MHTMLGenerationManager* BrowserProcessImpl::mhtml_generation_manager() { | 691 MHTMLGenerationManager* BrowserProcessImpl::mhtml_generation_manager() { |
| 693 if (!mhtml_generation_manager_.get()) | 692 if (!mhtml_generation_manager_.get()) |
| 694 mhtml_generation_manager_ = new MHTMLGenerationManager(); | 693 mhtml_generation_manager_ = new MHTMLGenerationManager(); |
| 695 | 694 |
| 696 return mhtml_generation_manager_.get(); | 695 return mhtml_generation_manager_.get(); |
| 697 } | 696 } |
| 698 | 697 |
| 699 GpuBlacklistUpdater* BrowserProcessImpl::gpu_blacklist_updater() { | |
| 700 if (!gpu_blacklist_updater_.get()) | |
| 701 gpu_blacklist_updater_ = new GpuBlacklistUpdater(); | |
| 702 | |
| 703 return gpu_blacklist_updater_.get(); | |
| 704 } | |
| 705 | |
| 706 ComponentUpdateService* BrowserProcessImpl::component_updater() { | 698 ComponentUpdateService* BrowserProcessImpl::component_updater() { |
| 707 #if defined(OS_CHROMEOS) | 699 #if defined(OS_CHROMEOS) |
| 708 return NULL; | 700 return NULL; |
| 709 #else | 701 #else |
| 710 if (!component_updater_.get()) { | 702 if (!component_updater_.get()) { |
| 711 ComponentUpdateService::Configurator* configurator = | 703 ComponentUpdateService::Configurator* configurator = |
| 712 MakeChromeComponentUpdaterConfigurator( | 704 MakeChromeComponentUpdaterConfigurator( |
| 713 CommandLine::ForCurrentProcess(), | 705 CommandLine::ForCurrentProcess(), |
| 714 io_thread()->system_url_request_context_getter()); | 706 io_thread()->system_url_request_context_getter()); |
| 715 // Creating the component updater does not do anything, components | 707 // Creating the component updater does not do anything, components |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1008 } | 1000 } |
| 1009 | 1001 |
| 1010 void BrowserProcessImpl::OnAutoupdateTimer() { | 1002 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1011 if (CanAutorestartForUpdate()) { | 1003 if (CanAutorestartForUpdate()) { |
| 1012 DLOG(WARNING) << "Detected update. Restarting browser."; | 1004 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1013 RestartBackgroundInstance(); | 1005 RestartBackgroundInstance(); |
| 1014 } | 1006 } |
| 1015 } | 1007 } |
| 1016 | 1008 |
| 1017 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1009 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |