| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index f43a1e35d5505160205a72f4878a2466f5d49e9b..15d2a137e8ace02bf34b4932dfbd2355e4bd17bc 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);
|
|
|