chrome/browser/chromeos/status/clock_menu_button_browsertest.cc - Issue 8591003: aura: Fix Chrome OS status area browser tests.

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/chromeos/status/clock_menu_button_browsertest.cc

Issue 8591003: aura: Fix Chrome OS status area browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rename to GetStatusAreaForTest() and remove const-ness Created 9 years, 1 month 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/chromeos/status/clock_menu_button_browsertest.cc

diff --git a/chrome/browser/chromeos/status/clock_menu_button_browsertest.cc b/chrome/browser/chromeos/status/clock_menu_button_browsertest.cc

index cdcb53f183e79ed0eb660637058bff1c825e53c1..b826ad2494e69f4e60f3ebfd4cdb6cc504c92b92 100644

--- a/chrome/browser/chromeos/status/clock_menu_button_browsertest.cc

+++ b/chrome/browser/chromeos/status/clock_menu_button_browsertest.cc

@@ -34,12 +34,12 @@ class ClockMenuButtonTest : public InProcessBrowserTest {

const ClockMenuButton* GetClockMenuButton() {

const views::View* parent = NULL;

#if defined(USE_AURA)

- parent = ChromeShellDelegate::instance()->GetStatusArea();

+ parent = ChromeShellDelegate::instance()->GetStatusAreaForTest();

#else

parent = static_cast<const BrowserView*>(browser()->window());

#endif

- return static_cast<const ClockMenuButton*>(parent->GetViewByID(

- VIEW_ID_STATUS_BUTTON_CLOCK));

+ return static_cast<const ClockMenuButton*>(

+ parent->GetViewByID(VIEW_ID_STATUS_BUTTON_CLOCK));

}

};