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

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: add some casts 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 fe476f0d7dc1c8c32ef482a1fb9b7497ad686f96..d61a700989184da84a3709c213a089f658efae34 100644
--- a/chrome/browser/chromeos/status/power_menu_button_browsertest.cc
+++ b/chrome/browser/chromeos/status/power_menu_button_browsertest.cc
@@ -9,6 +9,12 @@
#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 "ui/aura_shell/shell.h"
+#include "views/widget/widget.h"
+#endif
namespace chromeos {
@@ -21,9 +27,15 @@ 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)
+ aura_shell::Shell::GetInstance()->GetStatusAreaWidget()->
+ GetContentsView();
+#else
+ static_cast<BrowserView*>(browser()->window());
+#endif
+ return static_cast<PowerMenuButton*>(
+ view->GetViewByID(VIEW_ID_STATUS_BUTTON_POWER));
}
string16 CallPowerChangedAndGetTooltipText(const PowerSupplyStatus& status) {

Powered by Google App Engine
This is Rietveld 408576698