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

Unified Diff: chrome/browser/chrome_content_browser_client.h

Issue 2961403002: WIP fix for Ozone cursor woes in Mushrome: Numéro deux
Patch Set: 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
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5c729d5741474fa28795509ef190dfa68e95858b..23a5e836cfb5d0cd21c432ab46d6ddda15d47e67 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -23,6 +23,9 @@
#include "media/media_features.h"
#include "ppapi/features/features.h"
#include "services/service_manager/public/cpp/binder_registry.h"
+#if defined(OS_CHROMEOS)
+#include "ui/base/cursor/image_cursors.h"
+#endif // defined(OS_CHROMEOS)
class ChromeContentBrowserClientParts;
@@ -53,12 +56,6 @@ namespace version_info {
enum class Channel;
}
-#if defined(OS_CHROMEOS)
-namespace ui {
-class ImageCursors;
-}
-#endif // defined(OS_CHROMEOS)
-
namespace url {
class Origin;
}
@@ -405,7 +402,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
#if defined(OS_CHROMEOS)
// Created for the UI Service.
- std::unique_ptr<ui::ImageCursors> image_cursors_;
+ ui::ImageCursorsHolder image_cursors_holder_;
#endif // defined(OS_CHROMEOS)
base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698