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

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: add include 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 "ui/aura_shell/shell.h"
16 #include "views/widget/widget.h"
17 #endif
12 18
13 namespace chromeos { 19 namespace chromeos {
14 20
15 class PowerMenuButtonTest : public InProcessBrowserTest { 21 class PowerMenuButtonTest : public InProcessBrowserTest {
16 protected: 22 protected:
17 PowerMenuButtonTest() : InProcessBrowserTest() { 23 PowerMenuButtonTest() : InProcessBrowserTest() {
18 } 24 }
19 25
20 virtual void SetUpInProcessBrowserTestFixture() { 26 virtual void SetUpInProcessBrowserTestFixture() {
21 } 27 }
22 28
23 PowerMenuButton* GetPowerMenuButton() { 29 PowerMenuButton* GetPowerMenuButton() {
24 BrowserView* view = static_cast<BrowserView*>(browser()->window()); 30 views::View *view =
25 return static_cast<PowerMenuButton*>(view->GetViewByID( 31 #if defined(USE_AURA)
26 VIEW_ID_STATUS_BUTTON_POWER)); 32 aura_shell::Shell::GetInstance()->GetStatusAreaWidget()->
33 GetContentsView();
34 #else
35 static_cast<BrowserView*>(browser()->window());
36 #endif
37 return static_cast<PowerMenuButton*>(
38 view->GetViewByID(VIEW_ID_STATUS_BUTTON_POWER));
27 } 39 }
28 40
29 string16 CallPowerChangedAndGetTooltipText(const PowerSupplyStatus& status) { 41 string16 CallPowerChangedAndGetTooltipText(const PowerSupplyStatus& status) {
30 PowerMenuButton* power = GetPowerMenuButton(); 42 PowerMenuButton* power = GetPowerMenuButton();
31 43
32 power->PowerChanged(status); 44 power->PowerChanged(status);
33 EXPECT_TRUE(power->IsVisible()); 45 EXPECT_TRUE(power->IsVisible());
34 46
35 string16 tooltip; 47 string16 tooltip;
36 // There is static_cast<StatusAreaButton*> because GetTootipText is also 48 // 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. 146 // Simulate various levels of discharging.
135 for (double percent = 5.0; percent < 100.0; percent += 5.0) { 147 for (double percent = 5.0; percent < 100.0; percent += 5.0) {
136 status.battery_percentage = percent; 148 status.battery_percentage = percent;
137 const string16 tooltip_after = CallPowerChangedAndGetTooltipText(status); 149 const string16 tooltip_after = CallPowerChangedAndGetTooltipText(status);
138 EXPECT_NE(tooltip_before, tooltip_after); 150 EXPECT_NE(tooltip_before, tooltip_after);
139 tooltip_before = tooltip_after; 151 tooltip_before = tooltip_after;
140 } 152 }
141 } 153 }
142 154
143 } // namespace chromeos 155 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698