ash/shell.cc - Issue 2231533004: Pointer watcher modifications to support laser pointer.

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 2231533004: Pointer watcher modifications to support laser pointer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr

Patch Set: Created 4 years, 4 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 6f64011d9d6fcd1587fa62c87a3f506db1de1a04..8556bcb83848459dde310fc816f14f343853740d 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -825,9 +825,14 @@ void Shell::Init(const ShellInitParams& init_params) {

new ResolutionNotificationController);

#endif

- if (cursor_manager_)

+ if (cursor_manager_) {

cursor_manager_->SetDisplay(

display::Screen::GetScreen()->GetPrimaryDisplay());

+// wm_shell_->SetCursorManager(base::MakeUnique<::wm::CursorManager>(

+// base::WrapUnique<AshNativeCursorManager>(native_cursor_manager_)));

+ wm_shell_->SetCursorManager(base::WrapUnique<::wm::CursorManager>(

+ cursor_manager_.get()));

jdufault 2016/08/11 01:09:57 This is causing chrome to consistently crash on sh

+ }

accelerator_controller_delegate_.reset(new AcceleratorControllerDelegateAura);

wm_shell_->SetAcceleratorController(base::MakeUnique<AcceleratorController>(

« no previous file with comments | « ash/common/wm_shell.cc ('k') | ui/gfx/vector_icons/palette_mode_laser_pointer.icon » ('j') | no next file with comments »