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

Side by Side Diff: chrome/browser/browser_process_platform_part_chromeos.h

Issue 2916823002: Move Mus into chrome's process when running with --mus.
Patch Set: Removing debug include. Created 3 years, 5 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_CHROMEOS_H_
6 #define CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_CHROMEOS_H_ 6 #define CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_CHROMEOS_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/containers/flat_set.h" 12 #include "base/containers/flat_set.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/sequence_checker.h" 14 #include "base/sequence_checker.h"
15 #include "chrome/browser/browser_process_platform_part_base.h" 15 #include "chrome/browser/browser_process_platform_part_base.h"
16 #include "services/ui/common/image_cursors_set.h"
16 17
17 namespace chromeos { 18 namespace chromeos {
18 class ChromeSessionManager; 19 class ChromeSessionManager;
19 class ChromeUserManager; 20 class ChromeUserManager;
20 class ProfileHelper; 21 class ProfileHelper;
21 class TimeZoneResolver; 22 class TimeZoneResolver;
22 } 23 }
23 24
24 namespace chromeos { 25 namespace chromeos {
25 namespace system { 26 namespace system {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 chromeos::system::DeviceDisablingManager* device_disabling_manager() { 90 chromeos::system::DeviceDisablingManager* device_disabling_manager() {
90 return device_disabling_manager_.get(); 91 return device_disabling_manager_.get();
91 } 92 }
92 93
93 chromeos::system::TimeZoneResolverManager* GetTimezoneResolverManager(); 94 chromeos::system::TimeZoneResolverManager* GetTimezoneResolverManager();
94 95
95 chromeos::TimeZoneResolver* GetTimezoneResolver(); 96 chromeos::TimeZoneResolver* GetTimezoneResolver();
96 97
97 // Overridden from BrowserProcessPlatformPartBase: 98 // Overridden from BrowserProcessPlatformPartBase:
98 void StartTearDown() override; 99 void StartTearDown() override;
99
100 std::unique_ptr<policy::BrowserPolicyConnector> CreateBrowserPolicyConnector() 100 std::unique_ptr<policy::BrowserPolicyConnector> CreateBrowserPolicyConnector()
101 override; 101 override;
102 void RegisterInProcessServices(
103 content::ContentBrowserClient::StaticServiceMap* services) override;
102 104
103 chromeos::system::SystemClock* GetSystemClock(); 105 chromeos::system::SystemClock* GetSystemClock();
104 void DestroySystemClock(); 106 void DestroySystemClock();
105 107
106 void AddCompatibleCrOSComponent(const std::string& name); 108 void AddCompatibleCrOSComponent(const std::string& name);
107 109
108 bool IsCompatibleCrOSComponent(const std::string& name); 110 bool IsCompatibleCrOSComponent(const std::string& name);
109 111
110 #if defined(USE_OZONE) 112 #if defined(USE_OZONE)
111 ui::InputDeviceControllerClient* GetInputDeviceControllerClient(); 113 ui::InputDeviceControllerClient* GetInputDeviceControllerClient();
(...skipping 20 matching lines...) Expand all
132 std::unique_ptr<chromeos::system::TimeZoneResolverManager> 134 std::unique_ptr<chromeos::system::TimeZoneResolverManager>
133 timezone_resolver_manager_; 135 timezone_resolver_manager_;
134 std::unique_ptr<chromeos::TimeZoneResolver> timezone_resolver_; 136 std::unique_ptr<chromeos::TimeZoneResolver> timezone_resolver_;
135 137
136 std::unique_ptr<chromeos::system::SystemClock> system_clock_; 138 std::unique_ptr<chromeos::system::SystemClock> system_clock_;
137 139
138 std::unique_ptr<ScopedKeepAlive> keep_alive_; 140 std::unique_ptr<ScopedKeepAlive> keep_alive_;
139 141
140 base::flat_set<std::string> compatible_cros_components_; 142 base::flat_set<std::string> compatible_cros_components_;
141 143
144 // Used by the UI Service.
145 ui::ImageCursorsSet image_cursors_set_;
146
142 #if defined(USE_OZONE) 147 #if defined(USE_OZONE)
143 std::unique_ptr<ui::InputDeviceControllerClient> 148 std::unique_ptr<ui::InputDeviceControllerClient>
144 input_device_controller_client_; 149 input_device_controller_client_;
145 #endif 150 #endif
146 151
147 SEQUENCE_CHECKER(sequence_checker_); 152 SEQUENCE_CHECKER(sequence_checker_);
148 153
149 DISALLOW_COPY_AND_ASSIGN(BrowserProcessPlatformPart); 154 DISALLOW_COPY_AND_ASSIGN(BrowserProcessPlatformPart);
150 }; 155 };
151 156
152 #endif // CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_CHROMEOS_H_ 157 #endif // CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_CHROMEOS_H_
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_platform_part_base.cc ('k') | chrome/browser/browser_process_platform_part_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698