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

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

Issue 8742030: views: Move view.h to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and fix conflicts Created 9 years 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" 12 #include "ui/views/view.h"
13 13
14 #if defined(USE_AURA) 14 #if defined(USE_AURA)
15 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" 15 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
16 #endif 16 #endif
17 17
18 namespace chromeos { 18 namespace chromeos {
19 19
20 class PowerMenuButtonTest : public InProcessBrowserTest { 20 class PowerMenuButtonTest : public InProcessBrowserTest {
21 protected: 21 protected:
22 PowerMenuButtonTest() : InProcessBrowserTest() { 22 PowerMenuButtonTest() : InProcessBrowserTest() {
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 // Simulate various levels of discharging. 144 // Simulate various levels of discharging.
145 for (double percent = 5.0; percent < 100.0; percent += 5.0) { 145 for (double percent = 5.0; percent < 100.0; percent += 5.0) {
146 status.battery_percentage = percent; 146 status.battery_percentage = percent;
147 const string16 tooltip_after = CallPowerChangedAndGetTooltipText(status); 147 const string16 tooltip_after = CallPowerChangedAndGetTooltipText(status);
148 EXPECT_NE(tooltip_before, tooltip_after); 148 EXPECT_NE(tooltip_before, tooltip_after);
149 tooltip_before = tooltip_after; 149 tooltip_before = tooltip_after;
150 } 150 }
151 } 151 }
152 152
153 } // namespace chromeos 153 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/sim_dialog_delegate.cc ('k') | chrome/browser/chromeos/status/status_area_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698