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

Unified Diff: chrome/browser/chromeos/status/status_area_view_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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/status/status_area_view_browsertest.cc
diff --git a/chrome/browser/chromeos/status/status_area_view_browsertest.cc b/chrome/browser/chromeos/status/status_area_view_browsertest.cc
index 6aceac67a0d5427490c77bcb9c4f7afa86cc2477..fb476f0cecc4ad3068ddfe3c83b8076be2275ac0 100644
--- a/chrome/browser/chromeos/status/status_area_view_browsertest.cc
+++ b/chrome/browser/chromeos/status/status_area_view_browsertest.cc
@@ -7,6 +7,12 @@
#include "chrome/browser/chromeos/view_ids.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "views/view.h"
+
+#if defined(USE_AURA)
+#include "ui/aura_shell/shell.h"
+#include "views/widget/widget.h"
+#endif
namespace chromeos {
@@ -14,7 +20,13 @@ class StatusAreaViewTest : public InProcessBrowserTest {
protected:
StatusAreaViewTest() : InProcessBrowserTest() {}
StatusAreaView* GetStatusAreaView() {
- BrowserView* view = static_cast<BrowserView*>(browser()->window());
+ views::View *view =
+#if defined(USE_AURA)
+ aura_shell::Shell::GetInstance()->GetStatusAreaWidget()->
+ GetContentsView();
+#else
+ static_cast<BrowserView*>(browser()->window());
+#endif
return static_cast<StatusAreaView*>(view->GetViewByID(VIEW_ID_STATUS_AREA));
}
};

Powered by Google App Engine
This is Rietveld 408576698