Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index f43a1e35d5505160205a72f4878a2466f5d49e9b..03234399e337c43f70d19cc6a6808d87b1044f3c 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" |
Daniel Erat
2012/09/10 23:16:45
nit: are you using this?
mazda
2012/09/11 00:45:09
No. Removed, thanks.
|
#include "base/message_pump_aurax11.h" |
#include "chromeos/display/output_configurator.h" |
#endif // defined(OS_CHROMEOS) |
@@ -372,6 +373,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); |