Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Side by Side Diff: chrome/browser/browser_process_impl.cc

Issue 14698027: Move winaura specific methods and members from chrome/browser/browser_process.h to chrome/browser/b… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix includes in testing_browser_process_platform_part.h Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/browser_process_impl_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
105 #elif defined(OS_MACOSX) 102 #elif defined(OS_MACOSX)
106 #include "chrome/browser/chrome_browser_main_mac.h" 103 #include "chrome/browser/chrome_browser_main_mac.h"
107 #endif 104 #endif
108 105
109 #if defined(USE_AURA) 106 #if defined(USE_AURA)
110 #include "ui/aura/env.h" 107 #include "ui/aura/env.h"
111 #endif 108 #endif
112 109
113 #if defined(OS_CHROMEOS) 110 #if defined(OS_CHROMEOS)
114 #include "chrome/browser/browser_process_platform_part_chromeos.h" 111 #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"
115 #else 114 #else
116 #include "chrome/browser/browser_process_platform_part.h" 115 #include "chrome/browser/browser_process_platform_part.h"
117 #endif // defined(OS_CHROMEOS) 116 #endif // defined(OS_CHROMEOS)
118 117
119 #if !defined(OS_ANDROID) 118 #if !defined(OS_ANDROID)
120 #include "chrome/browser/media_galleries/media_file_system_registry.h" 119 #include "chrome/browser/media_galleries/media_file_system_registry.h"
121 #endif 120 #endif
122 121
123 #if defined(ENABLE_PLUGIN_INSTALLATION) 122 #if defined(ENABLE_PLUGIN_INSTALLATION)
124 #include "chrome/browser/plugins/plugins_resource_service.h" 123 #include "chrome/browser/plugins/plugins_resource_service.h"
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 BrowserProcessImpl::media_file_system_registry() { 626 BrowserProcessImpl::media_file_system_registry() {
628 #if defined(OS_ANDROID) 627 #if defined(OS_ANDROID)
629 return NULL; 628 return NULL;
630 #else 629 #else
631 if (!media_file_system_registry_) 630 if (!media_file_system_registry_)
632 media_file_system_registry_.reset(new chrome::MediaFileSystemRegistry()); 631 media_file_system_registry_.reset(new chrome::MediaFileSystemRegistry());
633 return media_file_system_registry_.get(); 632 return media_file_system_registry_.get();
634 #endif 633 #endif
635 } 634 }
636 635
637 #if !defined(OS_WIN)
638 void BrowserProcessImpl::PlatformSpecificCommandLineProcessing(
639 const CommandLine& command_line) {
640 }
641 #endif
642
643 bool BrowserProcessImpl::created_local_state() const { 636 bool BrowserProcessImpl::created_local_state() const {
644 return created_local_state_; 637 return created_local_state_;
645 } 638 }
646 639
647 // static 640 // static
648 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { 641 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
649 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, 642 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled,
650 false); 643 false);
651 // This policy needs to be defined before the net subsystem is initialized, 644 // This policy needs to be defined before the net subsystem is initialized,
652 // so we do it here. 645 // so we do it here.
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
1058 } 1051 }
1059 1052
1060 void BrowserProcessImpl::OnAutoupdateTimer() { 1053 void BrowserProcessImpl::OnAutoupdateTimer() {
1061 if (CanAutorestartForUpdate()) { 1054 if (CanAutorestartForUpdate()) {
1062 DLOG(WARNING) << "Detected update. Restarting browser."; 1055 DLOG(WARNING) << "Detected update. Restarting browser.";
1063 RestartBackgroundInstance(); 1056 RestartBackgroundInstance();
1064 } 1057 }
1065 } 1058 }
1066 1059
1067 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1060 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/browser_process_impl_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698