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

Side by Side Diff: chrome/browser/chromeos/system/ash_system_tray_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: rebase, fix interactive_ui_tests 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
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/ui/views/ash/chrome_shell_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/chromeos/system/ash_system_tray_delegate.h" 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/system/audio/audio_observer.h" 9 #include "ash/system/audio/audio_observer.h"
10 #include "ash/system/bluetooth/bluetooth_observer.h" 10 #include "ash/system/bluetooth/bluetooth_observer.h"
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 input_method::InputMethodManager::GetInstance(); 356 input_method::InputMethodManager::GetInstance();
357 return ime_manager->GetXKeyboard()->CapsLockIsEnabled(); 357 return ime_manager->GetXKeyboard()->CapsLockIsEnabled();
358 } 358 }
359 359
360 virtual void SetCapsLockEnabled(bool enabled) OVERRIDE { 360 virtual void SetCapsLockEnabled(bool enabled) OVERRIDE {
361 input_method::InputMethodManager* ime_manager = 361 input_method::InputMethodManager* ime_manager =
362 input_method::InputMethodManager::GetInstance(); 362 input_method::InputMethodManager::GetInstance();
363 return ime_manager->GetXKeyboard()->SetCapsLockEnabled(enabled); 363 return ime_manager->GetXKeyboard()->SetCapsLockEnabled(enabled);
364 } 364 }
365 365
366 virtual bool IsInAccessibilityMode() const OVERRIDE {
367 return accessibility_enabled_.GetValue();
368 }
369
370 virtual void SetEnableSpokenFeedback(bool enable) OVERRIDE {
371 chromeos::accessibility::EnableSpokenFeedback(enable, NULL);
372 }
373
374 virtual void ShutDown() OVERRIDE { 366 virtual void ShutDown() OVERRIDE {
375 DBusThreadManager::Get()->GetPowerManagerClient()->RequestShutdown(); 367 DBusThreadManager::Get()->GetPowerManagerClient()->RequestShutdown();
376 } 368 }
377 369
378 virtual void SignOut() OVERRIDE { 370 virtual void SignOut() OVERRIDE {
379 browser::AttemptUserExit(); 371 browser::AttemptUserExit();
380 } 372 }
381 373
382 virtual void RequestLockScreen() OVERRIDE { 374 virtual void RequestLockScreen() OVERRIDE {
383 DBusThreadManager::Get()->GetPowerManagerClient()-> 375 DBusThreadManager::Get()->GetPowerManagerClient()->
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
1246 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1238 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1247 }; 1239 };
1248 1240
1249 } // namespace 1241 } // namespace
1250 1242
1251 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { 1243 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
1252 return new chromeos::SystemTrayDelegate(tray); 1244 return new chromeos::SystemTrayDelegate(tray);
1253 } 1245 }
1254 1246
1255 } // namespace chromeos 1247 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/ui/views/ash/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698