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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 | 92 |
93 #if defined(ENABLE_CONFIGURATION_POLICY) | 93 #if defined(ENABLE_CONFIGURATION_POLICY) |
94 #include "chrome/browser/policy/browser_policy_connector.h" | 94 #include "chrome/browser/policy/browser_policy_connector.h" |
95 #else | 95 #else |
96 #include "chrome/browser/policy/policy_service_stub.h" | 96 #include "chrome/browser/policy/policy_service_stub.h" |
97 #endif // defined(ENABLE_CONFIGURATION_POLICY) | 97 #endif // defined(ENABLE_CONFIGURATION_POLICY) |
98 | 98 |
99 #if defined(OS_WIN) | 99 #if defined(OS_WIN) |
100 #include "base/win/windows_version.h" | 100 #include "base/win/windows_version.h" |
101 #include "ui/views/focus/view_storage.h" | 101 #include "ui/views/focus/view_storage.h" |
| 102 #if defined(USE_AURA) |
| 103 #include "chrome/browser/metro_viewer/metro_viewer_process_host_win.h" |
| 104 #endif |
102 #elif defined(OS_MACOSX) | 105 #elif defined(OS_MACOSX) |
103 #include "chrome/browser/chrome_browser_main_mac.h" | 106 #include "chrome/browser/chrome_browser_main_mac.h" |
104 #endif | 107 #endif |
105 | 108 |
106 #if defined(USE_AURA) | 109 #if defined(USE_AURA) |
107 #include "ui/aura/env.h" | 110 #include "ui/aura/env.h" |
108 #endif | 111 #endif |
109 | 112 |
110 #if defined(OS_CHROMEOS) | 113 #if defined(OS_CHROMEOS) |
111 #include "chrome/browser/browser_process_platform_part_chromeos.h" | 114 #include "chrome/browser/browser_process_platform_part_chromeos.h" |
112 #elif defined(OS_WIN) && defined(USE_AURA) | |
113 #include "chrome/browser/browser_process_platform_part_aurawin.h" | |
114 #else | 115 #else |
115 #include "chrome/browser/browser_process_platform_part.h" | 116 #include "chrome/browser/browser_process_platform_part.h" |
116 #endif // defined(OS_CHROMEOS) | 117 #endif // defined(OS_CHROMEOS) |
117 | 118 |
118 #if !defined(OS_ANDROID) | 119 #if !defined(OS_ANDROID) |
119 #include "chrome/browser/media_galleries/media_file_system_registry.h" | 120 #include "chrome/browser/media_galleries/media_file_system_registry.h" |
120 #endif | 121 #endif |
121 | 122 |
122 #if defined(ENABLE_PLUGIN_INSTALLATION) | 123 #if defined(ENABLE_PLUGIN_INSTALLATION) |
123 #include "chrome/browser/plugins/plugins_resource_service.h" | 124 #include "chrome/browser/plugins/plugins_resource_service.h" |
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
626 BrowserProcessImpl::media_file_system_registry() { | 627 BrowserProcessImpl::media_file_system_registry() { |
627 #if defined(OS_ANDROID) | 628 #if defined(OS_ANDROID) |
628 return NULL; | 629 return NULL; |
629 #else | 630 #else |
630 if (!media_file_system_registry_) | 631 if (!media_file_system_registry_) |
631 media_file_system_registry_.reset(new chrome::MediaFileSystemRegistry()); | 632 media_file_system_registry_.reset(new chrome::MediaFileSystemRegistry()); |
632 return media_file_system_registry_.get(); | 633 return media_file_system_registry_.get(); |
633 #endif | 634 #endif |
634 } | 635 } |
635 | 636 |
| 637 #if !defined(OS_WIN) |
| 638 void BrowserProcessImpl::PlatformSpecificCommandLineProcessing( |
| 639 const CommandLine& command_line) { |
| 640 } |
| 641 #endif |
| 642 |
636 bool BrowserProcessImpl::created_local_state() const { | 643 bool BrowserProcessImpl::created_local_state() const { |
637 return created_local_state_; | 644 return created_local_state_; |
638 } | 645 } |
639 | 646 |
640 // static | 647 // static |
641 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { | 648 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { |
642 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, | 649 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, |
643 false); | 650 false); |
644 // This policy needs to be defined before the net subsystem is initialized, | 651 // This policy needs to be defined before the net subsystem is initialized, |
645 // so we do it here. | 652 // so we do it here. |
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1051 } | 1058 } |
1052 | 1059 |
1053 void BrowserProcessImpl::OnAutoupdateTimer() { | 1060 void BrowserProcessImpl::OnAutoupdateTimer() { |
1054 if (CanAutorestartForUpdate()) { | 1061 if (CanAutorestartForUpdate()) { |
1055 DLOG(WARNING) << "Detected update. Restarting browser."; | 1062 DLOG(WARNING) << "Detected update. Restarting browser."; |
1056 RestartBackgroundInstance(); | 1063 RestartBackgroundInstance(); |
1057 } | 1064 } |
1058 } | 1065 } |
1059 | 1066 |
1060 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1067 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |