Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(524)

Side by Side Diff: chrome/browser/chromeos/status/power_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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/status/power_menu_button.h" 5 #include "chrome/browser/chromeos/status/power_menu_button.h"
6 6
7 #include "chrome/browser/chromeos/frame/browser_view.h" 7 #include "chrome/browser/chromeos/frame/browser_view.h"
8 #include "chrome/browser/chromeos/view_ids.h" 8 #include "chrome/browser/chromeos/view_ids.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_window.h" 10 #include "chrome/browser/ui/browser_window.h"
11 #include "chrome/test/base/in_process_browser_test.h" 11 #include "chrome/test/base/in_process_browser_test.h"
12 #include "views/view.h"
13
14 #if defined(USE_AURA)
15 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
16 #endif
12 17
13 namespace chromeos { 18 namespace chromeos {
14 19
15 class PowerMenuButtonTest : public InProcessBrowserTest { 20 class PowerMenuButtonTest : public InProcessBrowserTest {
16 protected: 21 protected:
17 PowerMenuButtonTest() : InProcessBrowserTest() { 22 PowerMenuButtonTest() : InProcessBrowserTest() {
18 } 23 }
19 24
20 virtual void SetUpInProcessBrowserTestFixture() { 25 virtual void SetUpInProcessBrowserTestFixture() {
21 } 26 }
22 27
23 PowerMenuButton* GetPowerMenuButton() { 28 PowerMenuButton* GetPowerMenuButton() {
24 BrowserView* view = static_cast<BrowserView*>(browser()->window()); 29 views::View* view =
25 return static_cast<PowerMenuButton*>(view->GetViewByID( 30 #if defined(USE_AURA)
26 VIEW_ID_STATUS_BUTTON_POWER)); 31 ChromeShellDelegate::instance()->GetStatusAreaForTest();
32 #else
33 static_cast<BrowserView*>(browser()->window());
34 #endif
35 return static_cast<PowerMenuButton*>(
36 view->GetViewByID(VIEW_ID_STATUS_BUTTON_POWER));
27 } 37 }
28 38
29 string16 CallPowerChangedAndGetTooltipText(const PowerSupplyStatus& status) { 39 string16 CallPowerChangedAndGetTooltipText(const PowerSupplyStatus& status) {
30 PowerMenuButton* power = GetPowerMenuButton(); 40 PowerMenuButton* power = GetPowerMenuButton();
31 41
32 power->PowerChanged(status); 42 power->PowerChanged(status);
33 EXPECT_TRUE(power->IsVisible()); 43 EXPECT_TRUE(power->IsVisible());
34 44
35 string16 tooltip; 45 string16 tooltip;
36 // There is static_cast<StatusAreaButton*> because GetTootipText is also 46 // There is static_cast<StatusAreaButton*> because GetTootipText is also
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 // Simulate various levels of discharging. 144 // Simulate various levels of discharging.
135 for (double percent = 5.0; percent < 100.0; percent += 5.0) { 145 for (double percent = 5.0; percent < 100.0; percent += 5.0) {
136 status.battery_percentage = percent; 146 status.battery_percentage = percent;
137 const string16 tooltip_after = CallPowerChangedAndGetTooltipText(status); 147 const string16 tooltip_after = CallPowerChangedAndGetTooltipText(status);
138 EXPECT_NE(tooltip_before, tooltip_after); 148 EXPECT_NE(tooltip_before, tooltip_after);
139 tooltip_before = tooltip_after; 149 tooltip_before = tooltip_after;
140 } 150 }
141 } 151 }
142 152
143 } // namespace chromeos 153 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/clock_menu_button_browsertest.cc ('k') | chrome/browser/chromeos/status/status_area_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698