| Index: chrome/browser/ui/views/ash/chrome_shell_delegate.cc
|
| diff --git a/chrome/browser/ui/views/ash/chrome_shell_delegate.cc b/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
|
| index ae621d0129f4ee2d51891a0a2f0c5dbd426967cd..b7c64bd204cc42feb77a67aa9ae1055c605b7e70 100644
|
| --- a/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
|
| +++ b/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
|
| @@ -34,16 +34,19 @@
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "base/chromeos/chromeos_version.h"
|
| +#include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
|
| #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"
|
| #include "chrome/browser/chromeos/extensions/file_manager_util.h"
|
| #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
|
| -#include "chrome/browser/chromeos/login/webui_login_display_host.h"
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| +#include "chrome/browser/chromeos/login/webui_login_display_host.h"
|
| #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
|
| +#include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
|
| #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
|
| +#include "chrome/common/pref_names.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "chromeos/dbus/power_manager_client.h"
|
| #endif
|
| @@ -122,6 +125,15 @@ bool ChromeShellDelegate::IsScreenLocked() const {
|
| #endif
|
| }
|
|
|
| +bool ChromeShellDelegate::IsSpokenFeedbackEnabled() const {
|
| +#if defined(OS_CHROMEOS)
|
| + return g_browser_process->local_state()->GetBoolean(
|
| + prefs::kSpokenFeedbackEnabled);
|
| +#else
|
| + return false;
|
| +#endif
|
| +}
|
| +
|
| void ChromeShellDelegate::Shutdown() {
|
| #if defined(OS_CHROMEOS)
|
| content::RecordAction(content::UserMetricsAction("Shutdown"));
|
|
|