ash/accelerators/accelerator_filter.cc - Issue 10442017: Rename GetRootWindow() -> GetPrimaryRootWindow()

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/accelerators/accelerator_filter.cc

Issue 10442017: Rename GetRootWindow() -> GetPrimaryRootWindow() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: git-try -b linux_chromeos,win_aura Created 8 years, 7 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/accelerators/accelerator_filter.cc

diff --git a/ash/accelerators/accelerator_filter.cc b/ash/accelerators/accelerator_filter.cc

index bcecdfe2b1e80d6feb5b10d7ad326cc49d2de418..21f8a414675cb68d3d8cbe629eeff539e15c3cae 100644

--- a/ash/accelerators/accelerator_filter.cc

+++ b/ash/accelerators/accelerator_filter.cc

@@ -21,7 +21,7 @@ const int kModifierFlagMask = (ui::EF_SHIFT_DOWN |

bool ShouldProcessAcceleratorsNow(aura::Window* target) {

if (!target)

return true;

- if (target == ash::Shell::GetInstance()->GetRootWindow())

+ if (target == ash::Shell::GetPrimaryRootWindow())

return true;

// Unless |target| is the root window, return false to let the custom focus

// manager (see ash/shell.cc) handle Ash accelerators.