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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.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
Index: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
index e2204523a5ceae03868b8a5c23299be8945e58ec..1fd36387339d4e33a9732b03b07114e7df98b388 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
@@ -24,11 +24,11 @@
#include "chrome/browser/signin/signin_error_notifier_factory_ash.h"
#include "chrome/browser/speech/tts_controller.h"
#include "chrome/browser/sync/sync_error_notifier_factory_ash.h"
+#include "chrome/browser/ui/ash/accessibility/automation_manager_ash.h"
#include "chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h"
#include "chrome/browser/ui/ash/media_delegate_chromeos.h"
#include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
#include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
-#include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_window.h"
@@ -171,12 +171,12 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
if (profile) {
switch (alert) {
case ui::A11Y_ALERT_WINDOW_NEEDED: {
- AutomationManagerAura::GetInstance()->HandleAlert(
+ AutomationManagerAsh::GetInstance()->HandleAlert(
profile, l10n_util::GetStringUTF8(IDS_A11Y_ALERT_WINDOW_NEEDED));
break;
}
case ui::A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED: {
- AutomationManagerAura::GetInstance()->HandleAlert(
+ AutomationManagerAsh::GetInstance()->HandleAlert(
profile, l10n_util::GetStringUTF8(
IDS_A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED));
break;
« no previous file with comments | « chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc ('k') | chrome/browser/ui/aura/accessibility/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698