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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/browser_process_platform_part_chromeos.h
diff --git a/chrome/browser/browser_process_platform_part_chromeos.h b/chrome/browser/browser_process_platform_part_chromeos.h
index 2aa21c178692c2313d1710fbe89ed250cbe677ff..6aaaed868e2bef9776b6b9060581ee94cf59922f 100644
--- a/chrome/browser/browser_process_platform_part_chromeos.h
+++ b/chrome/browser/browser_process_platform_part_chromeos.h
@@ -13,6 +13,7 @@
#include "base/macros.h"
#include "base/sequence_checker.h"
#include "chrome/browser/browser_process_platform_part_base.h"
+#include "services/ui/common/image_cursors_set.h"
namespace chromeos {
class ChromeSessionManager;
@@ -96,9 +97,10 @@ class BrowserProcessPlatformPart : public BrowserProcessPlatformPartBase {
// Overridden from BrowserProcessPlatformPartBase:
void StartTearDown() override;
-
std::unique_ptr<policy::BrowserPolicyConnector> CreateBrowserPolicyConnector()
override;
+ void RegisterInProcessServices(
+ content::ContentBrowserClient::StaticServiceMap* services) override;
chromeos::system::SystemClock* GetSystemClock();
void DestroySystemClock();
@@ -139,6 +141,9 @@ class BrowserProcessPlatformPart : public BrowserProcessPlatformPartBase {
base::flat_set<std::string> compatible_cros_components_;
+ // Used by the UI Service.
+ ui::ImageCursorsSet image_cursors_set_;
+
#if defined(USE_OZONE)
std::unique_ptr<ui::InputDeviceControllerClient>
input_device_controller_client_;
« 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