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

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: 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/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..1d92962468cf10d258a5a3d6c4ceadd72584492b 100644
--- a/chrome/browser/chromeos/status/status_area_view_browsertest.cc
+++ b/chrome/browser/chromeos/status/status_area_view_browsertest.cc
@@ -7,20 +7,31 @@
#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 "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
+#endif
namespace chromeos {
class StatusAreaViewTest : public InProcessBrowserTest {
protected:
StatusAreaViewTest() : InProcessBrowserTest() {}
- StatusAreaView* GetStatusAreaView() {
- BrowserView* view = static_cast<BrowserView*>(browser()->window());
- return static_cast<StatusAreaView*>(view->GetViewByID(VIEW_ID_STATUS_AREA));
+ const StatusAreaView* GetStatusAreaView() {
+ const views::View* view =
+#if defined(USE_AURA)
+ ChromeShellDelegate::instance()->GetStatusAreaForTest();
+#else
+ static_cast<BrowserView*>(browser()->window());
+#endif
+ return static_cast<const StatusAreaView*>(
+ view->GetViewByID(VIEW_ID_STATUS_AREA));
}
};
IN_PROC_BROWSER_TEST_F(StatusAreaViewTest, VisibleTest) {
- StatusAreaView* status = GetStatusAreaView();
+ const StatusAreaView* status = GetStatusAreaView();
EXPECT_TRUE(status->IsVisibleInRootView());
EXPECT_FALSE(status->size().IsEmpty());
}
« no previous file with comments | « chrome/browser/chromeos/status/status_area_view.cc ('k') | chrome/browser/ui/views/aura/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698