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

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: 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/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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 input_method::InputMethodManager::GetInstance(); 355 input_method::InputMethodManager::GetInstance();
356 return ime_manager->GetXKeyboard()->CapsLockIsEnabled(); 356 return ime_manager->GetXKeyboard()->CapsLockIsEnabled();
357 } 357 }
358 358
359 virtual void SetCapsLockEnabled(bool enabled) OVERRIDE { 359 virtual void SetCapsLockEnabled(bool enabled) OVERRIDE {
360 input_method::InputMethodManager* ime_manager = 360 input_method::InputMethodManager* ime_manager =
361 input_method::InputMethodManager::GetInstance(); 361 input_method::InputMethodManager::GetInstance();
362 return ime_manager->GetXKeyboard()->SetCapsLockEnabled(enabled); 362 return ime_manager->GetXKeyboard()->SetCapsLockEnabled(enabled);
363 } 363 }
364 364
365 virtual bool IsInAccessibilityMode() const OVERRIDE {
366 return accessibility_enabled_.GetValue();
367 }
368
369 virtual void SetEnableSpokenFeedback(bool enable) OVERRIDE {
370 chromeos::accessibility::EnableSpokenFeedback(enable, NULL);
371 }
372
373 virtual void ShutDown() OVERRIDE { 365 virtual void ShutDown() OVERRIDE {
374 DBusThreadManager::Get()->GetPowerManagerClient()->RequestShutdown(); 366 DBusThreadManager::Get()->GetPowerManagerClient()->RequestShutdown();
375 } 367 }
376 368
377 virtual void SignOut() OVERRIDE { 369 virtual void SignOut() OVERRIDE {
378 browser::AttemptUserExit(); 370 browser::AttemptUserExit();
379 } 371 }
380 372
381 virtual void RequestLockScreen() OVERRIDE { 373 virtual void RequestLockScreen() OVERRIDE {
382 DBusThreadManager::Get()->GetPowerManagerClient()-> 374 DBusThreadManager::Get()->GetPowerManagerClient()->
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
1245 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1237 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1246 }; 1238 };
1247 1239
1248 } // namespace 1240 } // namespace
1249 1241
1250 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { 1242 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
1251 return new chromeos::SystemTrayDelegate(tray); 1243 return new chromeos::SystemTrayDelegate(tray);
1252 } 1244 }
1253 1245
1254 } // namespace chromeos 1246 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698