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

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

Issue 2983443002: Make chrome --mus run the UI Service inside the browser process. (Closed)
Patch Set: Only register the UI Service in Mushrome, but not in Classic Ash. 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 std::unique_ptr<chromeos::system::TimeZoneResolverManager> 134 std::unique_ptr<chromeos::system::TimeZoneResolverManager>
134 timezone_resolver_manager_; 135 timezone_resolver_manager_;
135 std::unique_ptr<chromeos::TimeZoneResolver> timezone_resolver_; 136 std::unique_ptr<chromeos::TimeZoneResolver> timezone_resolver_;
136 137
137 std::unique_ptr<chromeos::system::SystemClock> system_clock_; 138 std::unique_ptr<chromeos::system::SystemClock> system_clock_;
138 139
139 std::unique_ptr<ScopedKeepAlive> keep_alive_; 140 std::unique_ptr<ScopedKeepAlive> keep_alive_;
140 141
141 base::flat_set<std::string> compatible_cros_components_; 142 base::flat_set<std::string> compatible_cros_components_;
142 143
144 // Used by the UI Service.
145 ui::ImageCursorsSet image_cursors_set_;
146
143 #if defined(USE_OZONE) 147 #if defined(USE_OZONE)
144 std::unique_ptr<ui::InputDeviceControllerClient> 148 std::unique_ptr<ui::InputDeviceControllerClient>
145 input_device_controller_client_; 149 input_device_controller_client_;
146 #endif 150 #endif
147 151
148 SEQUENCE_CHECKER(sequence_checker_); 152 SEQUENCE_CHECKER(sequence_checker_);
149 153
150 DISALLOW_COPY_AND_ASSIGN(BrowserProcessPlatformPart); 154 DISALLOW_COPY_AND_ASSIGN(BrowserProcessPlatformPart);
151 }; 155 };
152 156
153 #endif // CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_CHROMEOS_H_ 157 #endif // CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698