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

Unified Diff: chrome/browser/chrome_content_browser_client.h

Issue 2916823002: Move Mus into chrome's process when running with --mus.
Patch Set: Undo Screen TLS change, don't use Screen::GetScreen() in Mus. Created 3 years, 6 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/chrome_content_browser_client.h
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index a91a3b0a81e72c26bd6496c8083e366c48a6d3ed..5c729d5741474fa28795509ef190dfa68e95858b 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -53,6 +53,12 @@ namespace version_info {
enum class Channel;
}
+#if defined(OS_CHROMEOS)
+namespace ui {
+class ImageCursors;
+}
+#endif // defined(OS_CHROMEOS)
+
namespace url {
class Origin;
}
@@ -397,6 +403,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
service_manager::BinderRegistryWithParams<content::RenderFrameHost*>>
frame_interfaces_parameterized_;
+#if defined(OS_CHROMEOS)
+ // Created for the UI Service.
+ std::unique_ptr<ui::ImageCursors> image_cursors_;
+#endif // defined(OS_CHROMEOS)
+
base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);

Powered by Google App Engine
This is Rietveld 408576698