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

Unified Diff: ash/shell.cc

Issue 10919135: Move ash specific cursor code to CursorManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 f43a1e35d5505160205a72f4878a2466f5d49e9b..1a9c7a935047a5a14de870d326d2c9aa0b395848 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -100,6 +100,7 @@
#if defined(OS_CHROMEOS)
#include "ash/display/output_configurator_animation.h"
+#include "base/chromeos/chromeos_version.h"
#include "base/message_pump_aurax11.h"
#include "chromeos/display/output_configurator.h"
#endif // defined(OS_CHROMEOS)
@@ -361,6 +362,10 @@ void Shell::Init() {
aura::Env::GetInstance()->SetEventFilter(env_filter_);
cursor_manager_.set_delegate(this);
+#if defined(OS_CHROMEOS)
+ if (base::chromeos::IsRunningOnChromeOS())
+ cursor_manager_.HideHostCursor();
+#endif
focus_manager_.reset(new aura::FocusManager);
activation_controller_.reset(
@@ -372,6 +377,9 @@ void Shell::Init() {
aura::RootWindow* root_window = display_controller_->GetPrimaryRootWindow();
active_root_window_ = root_window;
+ cursor_manager_.SetDeviceScaleFactor(
+ root_window->AsRootWindowHostDelegate()->GetDeviceScaleFactor());
+
#if !defined(OS_MACOSX)
nested_dispatcher_controller_.reset(new NestedDispatcherController);
accelerator_controller_.reset(new AcceleratorController);
@@ -701,7 +709,6 @@ void Shell::InitRootWindowController(
if (user_action_client_.get())
aura::client::SetUserActionClient(root_window, user_action_client_.get());
- root_window->SetCursor(ui::kCursorPointer);
Daniel Erat 2012/09/06 23:47:15 Why's it okay to remove this? CursorManager looks
mazda 2012/09/07 02:20:57 I restored the line. CompoundEventFilter sets the
controller->InitLayoutManagers();
// TODO(oshima): Move the instance to RootWindowController when

Powered by Google App Engine
This is Rietveld 408576698