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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/status/power_menu_button_browsertest.cc
diff --git a/chrome/browser/chromeos/status/power_menu_button_browsertest.cc b/chrome/browser/chromeos/status/power_menu_button_browsertest.cc
index 9b485fae857c7f31a1f6b764ee4e5c9004b73757..475cad5b3df86976ef432b03a0d94fd939219d64 100644
--- a/chrome/browser/chromeos/status/power_menu_button_browsertest.cc
+++ b/chrome/browser/chromeos/status/power_menu_button_browsertest.cc
@@ -9,6 +9,11 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/test/base/in_process_browser_test.h"
+#include "views/view.h"
+
+#if defined(USE_AURA)
+#include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
+#endif
namespace chromeos {
@@ -21,9 +26,14 @@ class PowerMenuButtonTest : public InProcessBrowserTest {
}
PowerMenuButton* GetPowerMenuButton() {
- BrowserView* view = static_cast<BrowserView*>(browser()->window());
- return static_cast<PowerMenuButton*>(view->GetViewByID(
- VIEW_ID_STATUS_BUTTON_POWER));
+ views::View* view =
+#if defined(USE_AURA)
+ ChromeShellDelegate::instance()->GetStatusAreaForTest();
+#else
+ static_cast<BrowserView*>(browser()->window());
+#endif
+ return static_cast<PowerMenuButton*>(
+ view->GetViewByID(VIEW_ID_STATUS_BUTTON_POWER));
}
string16 CallPowerChangedAndGetTooltipText(const PowerSupplyStatus& status) {
« 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