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

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: 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 16 matching lines...) Expand all
27 #include "chrome/common/url_constants.h" 27 #include "chrome/common/url_constants.h"
28 #include "content/public/browser/notification_service.h" 28 #include "content/public/browser/notification_service.h"
29 #include "content/public/browser/user_metrics.h" 29 #include "content/public/browser/user_metrics.h"
30 #include "content/public/browser/web_contents.h" 30 #include "content/public/browser/web_contents.h"
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/browser_process.h"
37 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 38 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
38 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h" 39 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"
39 #include "chrome/browser/chromeos/extensions/file_manager_util.h" 40 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
40 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 41 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
42 #include "chrome/browser/chromeos/login/user_manager.h"
41 #include "chrome/browser/chromeos/login/webui_login_display_host.h" 43 #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" 44 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
45 #include "chrome/browser/prefs/pref_service.h"
44 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" 46 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"
45 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 47 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
46 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" 48 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
49 #include "chrome/common/pref_names.h"
47 #include "chromeos/dbus/dbus_thread_manager.h" 50 #include "chromeos/dbus/dbus_thread_manager.h"
48 #include "chromeos/dbus/power_manager_client.h" 51 #include "chromeos/dbus/power_manager_client.h"
49 #endif 52 #endif
50 53
51 namespace { 54 namespace {
52 55
53 // Returns the browser that should handle accelerators. 56 // Returns the browser that should handle accelerators.
54 Browser* GetTargetBrowser() { 57 Browser* GetTargetBrowser() {
55 Browser* browser = browser::FindBrowserWithWindow(ash::wm::GetActiveWindow()); 58 Browser* browser = browser::FindBrowserWithWindow(ash::wm::GetActiveWindow());
56 if (browser) 59 if (browser)
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 bool ChromeShellDelegate::IsScreenLocked() const { 118 bool ChromeShellDelegate::IsScreenLocked() const {
116 #if defined(OS_CHROMEOS) 119 #if defined(OS_CHROMEOS)
117 if (!chromeos::ScreenLocker::default_screen_locker()) 120 if (!chromeos::ScreenLocker::default_screen_locker())
118 return false; 121 return false;
119 return chromeos::ScreenLocker::default_screen_locker()->locked(); 122 return chromeos::ScreenLocker::default_screen_locker()->locked();
120 #else 123 #else
121 return false; 124 return false;
122 #endif 125 #endif
123 } 126 }
124 127
128 bool ChromeShellDelegate::IsSpokenFeedbackEnabled() const {
129 #if defined(OS_CHROMEOS)
130 return g_browser_process->local_state()->GetBoolean(
131 prefs::kSpokenFeedbackEnabled);
132 #else
133 return false;
134 #endif
135 }
136
125 void ChromeShellDelegate::Shutdown() { 137 void ChromeShellDelegate::Shutdown() {
126 #if defined(OS_CHROMEOS) 138 #if defined(OS_CHROMEOS)
127 content::RecordAction(content::UserMetricsAction("Shutdown")); 139 content::RecordAction(content::UserMetricsAction("Shutdown"));
128 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> 140 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
129 RequestShutdown(); 141 RequestShutdown();
130 #endif 142 #endif
131 } 143 }
132 144
133 void ChromeShellDelegate::Exit() { 145 void ChromeShellDelegate::Exit() {
134 browser::AttemptUserExit(); 146 browser::AttemptUserExit();
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 ash::Shell::GetInstance()->CreateLauncher(); 330 ash::Shell::GetInstance()->CreateLauncher();
319 break; 331 break;
320 default: 332 default:
321 NOTREACHED() << "Unexpected notification " << type; 333 NOTREACHED() << "Unexpected notification " << type;
322 } 334 }
323 #else 335 #else
324 // MSVC++ warns about switch statements without any cases. 336 // MSVC++ warns about switch statements without any cases.
325 NOTREACHED() << "Unexpected notification " << type; 337 NOTREACHED() << "Unexpected notification " << type;
326 #endif 338 #endif
327 } 339 }
OLDNEW
« ash/shell/shell_delegate_impl.h ('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