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

Side by Side Diff: chrome/browser/ui/views/ash/chrome_shell_delegate.cc

Issue 10543158: Do not toggle Applist with Search key press when accessibility is enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge similar functions Created 8 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/launcher/launcher_types.h" 7 #include "ash/launcher/launcher_types.h"
8 #include "ash/system/tray/system_tray_delegate.h" 8 #include "ash/system/tray/system_tray_delegate.h"
9 #include "ash/wm/partial_screenshot_view.h" 9 #include "ash/wm/partial_screenshot_view.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
(...skipping 20 matching lines...) Expand all
31 #include "grit/generated_resources.h" 31 #include "grit/generated_resources.h"
32 #include "ui/aura/client/user_action_client.h" 32 #include "ui/aura/client/user_action_client.h"
33 #include "ui/aura/window.h" 33 #include "ui/aura/window.h"
34 34
35 #if defined(OS_CHROMEOS) 35 #if defined(OS_CHROMEOS)
36 #include "base/chromeos/chromeos_version.h" 36 #include "base/chromeos/chromeos_version.h"
37 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 37 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
38 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h" 38 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"
39 #include "chrome/browser/chromeos/extensions/file_manager_util.h" 39 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
40 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 40 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
41 #include "chrome/browser/chromeos/login/user_manager.h"
41 #include "chrome/browser/chromeos/login/webui_login_display_host.h" 42 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
42 #include "chrome/browser/chromeos/login/user_manager.h"
43 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h" 43 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
44 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" 44 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"
45 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 45 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
46 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" 46 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
47 #include "chromeos/dbus/dbus_thread_manager.h" 47 #include "chromeos/dbus/dbus_thread_manager.h"
48 #include "chromeos/dbus/power_manager_client.h" 48 #include "chromeos/dbus/power_manager_client.h"
49 #endif 49 #endif
50 50
51 namespace { 51 namespace {
52 52
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 content::WebUI* login_screen_web_ui = NULL; 262 content::WebUI* login_screen_web_ui = NULL;
263 chromeos::WebUILoginDisplayHost* host = 263 chromeos::WebUILoginDisplayHost* host =
264 static_cast<chromeos::WebUILoginDisplayHost*>( 264 static_cast<chromeos::WebUILoginDisplayHost*>(
265 chromeos::BaseLoginDisplayHost::default_host()); 265 chromeos::BaseLoginDisplayHost::default_host());
266 if (host && host->GetOobeUI()) 266 if (host && host->GetOobeUI())
267 login_screen_web_ui = host->GetOobeUI()->web_ui(); 267 login_screen_web_ui = host->GetOobeUI()->web_ui();
268 chromeos::accessibility::ToggleSpokenFeedback(login_screen_web_ui); 268 chromeos::accessibility::ToggleSpokenFeedback(login_screen_web_ui);
269 #endif 269 #endif
270 } 270 }
271 271
272 bool ChromeShellDelegate::IsSpokenFeedbackEnabled() const {
273 #if defined(OS_CHROMEOS)
274 return chromeos::accessibility::IsSpokenFeedbackEnabled();
275 #else
276 return false;
277 #endif
278 }
279
272 app_list::AppListViewDelegate* 280 app_list::AppListViewDelegate*
273 ChromeShellDelegate::CreateAppListViewDelegate() { 281 ChromeShellDelegate::CreateAppListViewDelegate() {
274 // Shell will own the created delegate. 282 // Shell will own the created delegate.
275 return new AppListViewDelegate; 283 return new AppListViewDelegate;
276 } 284 }
277 285
278 void ChromeShellDelegate::StartPartialScreenshot( 286 void ChromeShellDelegate::StartPartialScreenshot(
279 ash::ScreenshotDelegate* screenshot_delegate) { 287 ash::ScreenshotDelegate* screenshot_delegate) {
280 ash::PartialScreenshotView::StartPartialScreenshot(screenshot_delegate); 288 ash::PartialScreenshotView::StartPartialScreenshot(screenshot_delegate);
281 } 289 }
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 ash::Shell::GetInstance()->CreateLauncher(); 326 ash::Shell::GetInstance()->CreateLauncher();
319 break; 327 break;
320 default: 328 default:
321 NOTREACHED() << "Unexpected notification " << type; 329 NOTREACHED() << "Unexpected notification " << type;
322 } 330 }
323 #else 331 #else
324 // MSVC++ warns about switch statements without any cases. 332 // MSVC++ warns about switch statements without any cases.
325 NOTREACHED() << "Unexpected notification " << type; 333 NOTREACHED() << "Unexpected notification " << type;
326 #endif 334 #endif
327 } 335 }
OLDNEW
« ash/shell/shell_delegate_impl.cc ('K') | « chrome/browser/ui/views/ash/chrome_shell_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698