ash/accelerators/accelerator_filter_unittest.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_unittest.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_unittest.cc

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

index 7f3e44b8de7a8b20eab35a7cec9607a769b22aca..86a50fadd12cc767a3ab241dbe4761dc64510461 100644

--- a/ash/accelerators/accelerator_filter_unittest.cc

+++ b/ash/accelerators/accelerator_filter_unittest.cc

@@ -66,7 +66,7 @@ TEST_F(AcceleratorFilterTest, TestFilterWithoutFocus) {

scoped_ptr<ScreenshotDelegate>(delegate).Pass());

EXPECT_EQ(0, delegate->handle_take_screenshot_count());

- aura::test::EventGenerator generator(Shell::GetRootWindow());

+ aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());

// AcceleratorController calls ScreenshotDelegate::HandleTakeScreenshot() when

// VKEY_PRINT is pressed. See kAcceleratorData[] in accelerator_controller.cc.

generator.PressKey(ui::VKEY_PRINT, 0);

@@ -94,7 +94,7 @@ TEST_F(AcceleratorFilterTest, TestFilterWithFocus) {

// AcceleratorFilter should ignore the key events since the root window is

// not focused.

- aura::test::EventGenerator generator(Shell::GetRootWindow());

+ aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());

generator.PressKey(ui::VKEY_PRINT, 0);

EXPECT_EQ(0, delegate->handle_take_screenshot_count());

generator.ReleaseKey(ui::VKEY_PRINT, 0);

@@ -111,7 +111,7 @@ TEST_F(AcceleratorFilterTest, TestCapsLockMask) {

scoped_ptr<ScreenshotDelegate>(delegate).Pass());

EXPECT_EQ(0, delegate->handle_take_screenshot_count());

- aura::test::EventGenerator generator(Shell::GetRootWindow());

+ aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());

generator.PressKey(ui::VKEY_PRINT, 0);

EXPECT_EQ(1, delegate->handle_take_screenshot_count());

generator.ReleaseKey(ui::VKEY_PRINT, 0);