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

Unified Diff: ash/shell.cc

Issue 2932563002: Implement cursor changing on Mushrome (Closed)
Patch Set: Remove last NOTIMPLEMENTED for this patch 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: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 6ef34b2bd6a5c8e041876f42b0e43506f7eaa954..2995b4cb2f83a957eaffa01fd5b02af347c42f64 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -92,7 +92,7 @@
#include "ash/wallpaper/wallpaper_controller.h"
#include "ash/wallpaper/wallpaper_delegate.h"
#include "ash/wm/ash_focus_rules.h"
-#include "ash/wm/ash_native_cursor_manager.h"
+#include "ash/wm/classic_ash_native_cursor_manager.h"
#include "ash/wm/container_finder.h"
#include "ash/wm/event_client_impl.h"
#include "ash/wm/immersive_context_ash.h"
@@ -101,6 +101,7 @@
#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
#include "ash/wm/mru_window_tracker.h"
+#include "ash/wm/mushrome_ash_native_cursor_manager.h"
#include "ash/wm/overlay_event_filter.h"
#include "ash/wm/overview/window_selector_controller.h"
#include "ash/wm/power_button_controller.h"
@@ -437,7 +438,7 @@ void Shell::SetLargeCursorSizeInDip(int large_cursor_size_in_dip) {
}
void Shell::SetCursorCompositingEnabled(bool enabled) {
- if (GetAshConfig() == Config::CLASSIC) {
+ if (GetAshConfig() != Config::MASH) {
// TODO: needs to work in mus. http://crbug.com/705592.
James Cook 2017/06/12 20:17:24 Comment still relevant? Should "mus" be "mash"?
Elliot Glaysher 2017/06/12 23:18:46 Done.
window_tree_host_manager_->cursor_window_controller()
->SetCursorCompositingEnabled(enabled);
@@ -858,7 +859,11 @@ void Shell::Init(const ShellInitParams& init_params) {
if (config == Config::CLASSIC) {
// TODO: needs to work in mus. http://crbug.com/705592.
James Cook 2017/06/12 20:17:24 ditto
Elliot Glaysher 2017/06/12 23:18:46 Done.
- native_cursor_manager_ = new AshNativeCursorManager;
+ native_cursor_manager_ = new ClassicAshNativeCursorManager;
+ cursor_manager_.reset(
James Cook 2017/06/12 20:17:24 nit: base::MakeUnique<>
Elliot Glaysher 2017/06/12 23:18:46 Done.
+ new CursorManager(base::WrapUnique(native_cursor_manager_)));
+ } else if (config == Config::MUS) {
+ native_cursor_manager_ = new MushromeAshNativeCursorManager;
cursor_manager_.reset(
new CursorManager(base::WrapUnique(native_cursor_manager_)));
}

Powered by Google App Engine
This is Rietveld 408576698