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

Side by Side Diff: ash/accelerators/accelerator_controller.cc

Issue 10377114: Remove some more OS_CHROMEOS from browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 "ash/accelerators/accelerator_controller.h" 5 #include "ash/accelerators/accelerator_controller.h"
6 6
7 #include "ash/accelerators/accelerator_table.h" 7 #include "ash/accelerators/accelerator_table.h"
8 #include "ash/ash_switches.h" 8 #include "ash/ash_switches.h"
9 #include "ash/caps_lock_delegate.h" 9 #include "ash/caps_lock_delegate.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 return volume_control_delegate_->HandleVolumeUp(accelerator); 349 return volume_control_delegate_->HandleVolumeUp(accelerator);
350 break; 350 break;
351 case FOCUS_LAUNCHER: 351 case FOCUS_LAUNCHER:
352 if (shell->launcher()) 352 if (shell->launcher())
353 return shell->focus_cycler()->FocusWidget(shell->launcher()->widget()); 353 return shell->focus_cycler()->FocusWidget(shell->launcher()->widget());
354 break; 354 break;
355 case FOCUS_TRAY: 355 case FOCUS_TRAY:
356 if (shell->tray()) 356 if (shell->tray())
357 return shell->focus_cycler()->FocusWidget(shell->tray()->GetWidget()); 357 return shell->focus_cycler()->FocusWidget(shell->tray()->GetWidget());
358 break; 358 break;
359 case SHOW_KEYBOARD_OVERLAY:
360 ash::Shell::GetInstance()->delegate()->ShowKeyboardOverlay(this);
361 break;
359 case SHOW_OAK: 362 case SHOW_OAK:
360 if (CommandLine::ForCurrentProcess()->HasSwitch( 363 if (CommandLine::ForCurrentProcess()->HasSwitch(
361 switches::kAshEnableOak)) { 364 switches::kAshEnableOak)) {
362 oak::ShowOakWindow(); 365 oak::ShowOakWindow();
363 return true; 366 return true;
364 } 367 }
365 break; 368 break;
366 case NEXT_IME: 369 case NEXT_IME:
367 if (ime_control_delegate_.get()) 370 if (ime_control_delegate_.get())
368 return ime_control_delegate_->HandleNextIme(); 371 return ime_control_delegate_->HandleNextIme();
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 // Then set this one as active. 500 // Then set this one as active.
498 Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index); 501 Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index);
499 } 502 }
500 } 503 }
501 504
502 bool AcceleratorController::CanHandleAccelerators() const { 505 bool AcceleratorController::CanHandleAccelerators() const {
503 return true; 506 return true;
504 } 507 }
505 508
506 } // namespace ash 509 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/accelerators/accelerator_table.h » ('j') | chrome/browser/ui/views/keyboard_overlay_dialog_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698