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

Unified Diff: chrome/browser/chromeos/status/accessibility_menu_button_browsertest.cc

Issue 8625004: aura: Fix input method and a11y status area browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/status/input_method_menu_button_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/status/accessibility_menu_button_browsertest.cc
diff --git a/chrome/browser/chromeos/status/accessibility_menu_button_browsertest.cc b/chrome/browser/chromeos/status/accessibility_menu_button_browsertest.cc
index 8de40518644d3d56149fc88abdac23d89abbad42..f87f84e4ab9b913c9b77859616028c9237087741 100644
--- a/chrome/browser/chromeos/status/accessibility_menu_button_browsertest.cc
+++ b/chrome/browser/chromeos/status/accessibility_menu_button_browsertest.cc
@@ -11,6 +11,10 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_window.h"
+#if defined(USE_AURA)
+#include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
+#endif
+
namespace chromeos {
class AccessibilityMenuButtonTest : public InProcessBrowserTest {
@@ -18,16 +22,21 @@ class AccessibilityMenuButtonTest : public InProcessBrowserTest {
AccessibilityMenuButtonTest() : InProcessBrowserTest() {
}
- AccessibilityMenuButton* GetAccessibilityMenuButton() {
- BrowserView* view = static_cast<BrowserView*>(browser()->window());
- return static_cast<AccessibilityMenuButton*>(view->GetViewByID(
- VIEW_ID_STATUS_BUTTON_ACCESSIBILITY));
+ const AccessibilityMenuButton* GetAccessibilityMenuButton() {
+ const views::View* view =
+#if defined(USE_AURA)
+ ChromeShellDelegate::instance()->GetStatusAreaForTest();
+#else
+ static_cast<BrowserView*>(browser()->window());
+#endif
+ return static_cast<const AccessibilityMenuButton*>(
+ view->GetViewByID(VIEW_ID_STATUS_BUTTON_ACCESSIBILITY));
}
};
IN_PROC_BROWSER_TEST_F(AccessibilityMenuButtonTest,
VisibilityIsSyncedWithPreference) {
- AccessibilityMenuButton* button = GetAccessibilityMenuButton();
+ const AccessibilityMenuButton* button = GetAccessibilityMenuButton();
ASSERT_TRUE(button != NULL);
accessibility::EnableAccessibility(true, NULL);
« no previous file with comments | « no previous file | chrome/browser/chromeos/status/input_method_menu_button_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698