chrome/browser/ui/views/ash/key_rewriter.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: chrome/browser/ui/views/ash/key_rewriter.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: chrome/browser/ui/views/ash/key_rewriter.cc

diff --git a/chrome/browser/ui/views/ash/key_rewriter.cc b/chrome/browser/ui/views/ash/key_rewriter.cc

index 951fccaa47c1595cb647981fb2ed4714ebf37bee..e7f28c4327d0ef553bc540c3221014627d3c00cd 100644

--- a/chrome/browser/ui/views/ash/key_rewriter.cc

+++ b/chrome/browser/ui/views/ash/key_rewriter.cc

@@ -33,7 +33,7 @@ const int kBadDeviceId = -1;

KeyRewriter::KeyRewriter() : last_device_id_(kBadDeviceId) {

// The ash shell isn't instantiated for our unit tests.

if (ash::Shell::HasInstance())

- ash::Shell::GetInstance()->GetRootWindow()->AddRootWindowObserver(this);

+ ash::Shell::GetPrimaryRootWindow()->AddRootWindowObserver(this);

#if defined(OS_CHROMEOS)

if (base::chromeos::IsRunningOnChromeOS()) {

chromeos::XInputHierarchyChangedEventListener::GetInstance()

@@ -45,7 +45,7 @@ KeyRewriter::KeyRewriter() : last_device_id_(kBadDeviceId) {

KeyRewriter::~KeyRewriter() {

if (ash::Shell::HasInstance())

- ash::Shell::GetInstance()->GetRootWindow()->RemoveRootWindowObserver(this);

+ ash::Shell::GetPrimaryRootWindow()->RemoveRootWindowObserver(this);

#if defined(OS_CHROMEOS)

if (base::chromeos::IsRunningOnChromeOS()) {

chromeos::XInputHierarchyChangedEventListener::GetInstance()