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

Unified Diff: chrome/browser/ui/views/chrome_views_delegate.cc

Issue 1040863002: Revert "Enable chrome.automation.getDesktop on all aura platforms." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months 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 | « chrome/browser/ui/aura/accessibility/ax_tree_source_aura.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/chrome_views_delegate.cc
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index 01a0585b453c120f092c3c3f5e217d82f5e15755..daba64bd75630b4114aaab4e9b76bf5491612e06 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -35,7 +35,6 @@
#endif
#if defined(USE_AURA)
-#include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#endif
@@ -53,6 +52,7 @@
#if defined(USE_ASH)
#include "ash/shell.h"
#include "ash/wm/window_state.h"
+#include "chrome/browser/ui/ash/accessibility/automation_manager_ash.h"
#include "chrome/browser/ui/ash/ash_init.h"
#include "chrome/browser/ui/ash/ash_util.h"
#endif
@@ -213,8 +213,8 @@ bool ChromeViewsDelegate::GetSavedWindowPlacement(
void ChromeViewsDelegate::NotifyAccessibilityEvent(
views::View* view, ui::AXEvent event_type) {
-#if defined(USE_AURA)
- AutomationManagerAura::GetInstance()->HandleEvent(
+#if defined(USE_ASH)
+ AutomationManagerAsh::GetInstance()->HandleEvent(
GetProfileForWindow(view->GetWidget()), view, event_type);
#endif
}
« no previous file with comments | « chrome/browser/ui/aura/accessibility/ax_tree_source_aura.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698