ash/shell.cc - Issue 10919135: Move ash specific cursor code to CursorManager.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Move HideHostCursor to x11_util.{cc,h} 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:

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"

#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);