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

Side by Side Diff: chrome/browser/chromeos/status/power_menu_button_browsertest.cc

Issue 9570044: Rename chrome/browser/ui/views/{aura => ash}/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 9 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:
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/status/status_area_view.h" 8 #include "chrome/browser/chromeos/status/status_area_view.h"
9 #include "chrome/browser/chromeos/view_ids.h" 9 #include "chrome/browser/chromeos/view_ids.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_window.h" 11 #include "chrome/browser/ui/browser_window.h"
12 #include "chrome/test/base/in_process_browser_test.h" 12 #include "chrome/test/base/in_process_browser_test.h"
13 #include "ui/views/view.h" 13 #include "ui/views/view.h"
14 14
15 #if defined(USE_AURA) 15 #if defined(USE_AURA)
16 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" 16 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
17 #endif 17 #endif
18 18
19 namespace chromeos { 19 namespace chromeos {
20 20
21 class PowerMenuButtonTest : public InProcessBrowserTest { 21 class PowerMenuButtonTest : public InProcessBrowserTest {
22 protected: 22 protected:
23 PowerMenuButtonTest() : InProcessBrowserTest() { 23 PowerMenuButtonTest() : InProcessBrowserTest() {
24 } 24 }
25 25
26 virtual void SetUpInProcessBrowserTestFixture() { 26 virtual void SetUpInProcessBrowserTestFixture() {
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 // Simulate various levels of discharging. 145 // Simulate various levels of discharging.
146 for (double percent = 5.0; percent < 100.0; percent += 5.0) { 146 for (double percent = 5.0; percent < 100.0; percent += 5.0) {
147 status.battery_percentage = percent; 147 status.battery_percentage = percent;
148 const string16 tooltip_after = CallPowerChangedAndGetTooltipText(status); 148 const string16 tooltip_after = CallPowerChangedAndGetTooltipText(status);
149 EXPECT_NE(tooltip_before, tooltip_after); 149 EXPECT_NE(tooltip_before, tooltip_after);
150 tooltip_before = tooltip_after; 150 tooltip_before = tooltip_after;
151 } 151 }
152 } 152 }
153 153
154 } // namespace chromeos 154 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698