OLD | NEW |
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 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 return true; | 314 return true; |
315 case TAKE_PARTIAL_SCREENSHOT: | 315 case TAKE_PARTIAL_SCREENSHOT: |
316 if (screenshot_delegate_.get()) | 316 if (screenshot_delegate_.get()) |
317 ash::Shell::GetInstance()->delegate()-> | 317 ash::Shell::GetInstance()->delegate()-> |
318 StartPartialScreenshot(screenshot_delegate_.get()); | 318 StartPartialScreenshot(screenshot_delegate_.get()); |
319 // Return true to prevent propagation of the key event because | 319 // Return true to prevent propagation of the key event because |
320 // this key combination is reserved for partial screenshot. | 320 // this key combination is reserved for partial screenshot. |
321 return true; | 321 return true; |
322 case SEARCH_KEY: | 322 case SEARCH_KEY: |
323 ash::Shell::GetInstance()->delegate()->Search(); | 323 ash::Shell::GetInstance()->delegate()->Search(); |
324 break; | 324 return true; |
325 case TOGGLE_APP_LIST: | 325 case TOGGLE_APP_LIST: |
326 ash::Shell::GetInstance()->ToggleAppList(); | 326 ash::Shell::GetInstance()->ToggleAppList(); |
327 break; | 327 return true; |
328 case TOGGLE_CAPS_LOCK: | 328 case TOGGLE_CAPS_LOCK: |
329 if (caps_lock_delegate_.get()) | 329 if (caps_lock_delegate_.get()) |
330 return caps_lock_delegate_->HandleToggleCapsLock(); | 330 return caps_lock_delegate_->HandleToggleCapsLock(); |
331 break; | 331 break; |
332 case BRIGHTNESS_DOWN: | 332 case BRIGHTNESS_DOWN: |
333 if (brightness_control_delegate_.get()) | 333 if (brightness_control_delegate_.get()) |
334 return brightness_control_delegate_->HandleBrightnessDown(accelerator); | 334 return brightness_control_delegate_->HandleBrightnessDown(accelerator); |
335 break; | 335 break; |
336 case BRIGHTNESS_UP: | 336 case BRIGHTNESS_UP: |
337 if (brightness_control_delegate_.get()) | 337 if (brightness_control_delegate_.get()) |
(...skipping 13 matching lines...) Expand all Loading... |
351 break; | 351 break; |
352 case FOCUS_LAUNCHER: | 352 case FOCUS_LAUNCHER: |
353 if (shell->launcher()) | 353 if (shell->launcher()) |
354 return shell->focus_cycler()->FocusWidget(shell->launcher()->widget()); | 354 return shell->focus_cycler()->FocusWidget(shell->launcher()->widget()); |
355 break; | 355 break; |
356 case FOCUS_TRAY: | 356 case FOCUS_TRAY: |
357 if (shell->tray()) | 357 if (shell->tray()) |
358 return shell->focus_cycler()->FocusWidget(shell->tray()->GetWidget()); | 358 return shell->focus_cycler()->FocusWidget(shell->tray()->GetWidget()); |
359 break; | 359 break; |
360 case SHOW_OAK: | 360 case SHOW_OAK: |
361 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshEnableOak)) | 361 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 362 switches::kAshEnableOak)) { |
362 oak::ShowOakWindow(); | 363 oak::ShowOakWindow(); |
| 364 return true; |
| 365 } |
363 break; | 366 break; |
364 case NEXT_IME: | 367 case NEXT_IME: |
365 if (ime_control_delegate_.get()) | 368 if (ime_control_delegate_.get()) |
366 return ime_control_delegate_->HandleNextIme(); | 369 return ime_control_delegate_->HandleNextIme(); |
367 break; | 370 break; |
368 case PREVIOUS_IME: | 371 case PREVIOUS_IME: |
369 if (ime_control_delegate_.get()) | 372 if (ime_control_delegate_.get()) |
370 return ime_control_delegate_->HandlePreviousIme(); | 373 return ime_control_delegate_->HandlePreviousIme(); |
371 break; | 374 break; |
372 case SWITCH_IME: | 375 case SWITCH_IME: |
373 if (ime_control_delegate_.get()) | 376 if (ime_control_delegate_.get()) |
374 return ime_control_delegate_->HandleSwitchIme(accelerator); | 377 return ime_control_delegate_->HandleSwitchIme(accelerator); |
375 break; | 378 break; |
376 case SELECT_WIN_0: | 379 case SELECT_WIN_0: |
377 SwitchToWindow(0); | 380 SwitchToWindow(0); |
378 break; | 381 return true; |
379 case SELECT_WIN_1: | 382 case SELECT_WIN_1: |
380 SwitchToWindow(1); | 383 SwitchToWindow(1); |
381 break; | 384 return true; |
382 case SELECT_WIN_2: | 385 case SELECT_WIN_2: |
383 SwitchToWindow(2); | 386 SwitchToWindow(2); |
384 break; | 387 return true; |
385 case SELECT_WIN_3: | 388 case SELECT_WIN_3: |
386 SwitchToWindow(3); | 389 SwitchToWindow(3); |
387 break; | 390 return true; |
388 case SELECT_WIN_4: | 391 case SELECT_WIN_4: |
389 SwitchToWindow(4); | 392 SwitchToWindow(4); |
390 break; | 393 return true; |
391 case SELECT_WIN_5: | 394 case SELECT_WIN_5: |
392 SwitchToWindow(5); | 395 SwitchToWindow(5); |
393 break; | 396 return true; |
394 case SELECT_WIN_6: | 397 case SELECT_WIN_6: |
395 SwitchToWindow(6); | 398 SwitchToWindow(6); |
396 break; | 399 return true; |
397 case SELECT_WIN_7: | 400 case SELECT_WIN_7: |
398 SwitchToWindow(7); | 401 SwitchToWindow(7); |
399 break; | 402 return true; |
400 case SELECT_LAST_WIN: | 403 case SELECT_LAST_WIN: |
401 SwitchToWindow(-1); | 404 SwitchToWindow(-1); |
402 break; | 405 return true; |
403 case WINDOW_SNAP_LEFT: | 406 case WINDOW_SNAP_LEFT: |
404 case WINDOW_SNAP_RIGHT: { | 407 case WINDOW_SNAP_RIGHT: { |
405 aura::Window* window = wm::GetActiveWindow(); | 408 aura::Window* window = wm::GetActiveWindow(); |
406 if (!window) | 409 if (!window) |
407 break; | 410 break; |
408 internal::SnapSizer sizer(window, | 411 internal::SnapSizer sizer(window, |
409 gfx::Point(), | 412 gfx::Point(), |
410 action == WINDOW_SNAP_LEFT ? internal::SnapSizer::LEFT_EDGE : | 413 action == WINDOW_SNAP_LEFT ? internal::SnapSizer::LEFT_EDGE : |
411 internal::SnapSizer::RIGHT_EDGE, | 414 internal::SnapSizer::RIGHT_EDGE, |
412 shell->GetGridSize()); | 415 shell->GetGridSize()); |
413 window->SetBounds(sizer.GetSnapBounds(window->bounds())); | 416 window->SetBounds(sizer.GetSnapBounds(window->bounds())); |
414 break; | 417 return true; |
415 } | 418 } |
416 case WINDOW_MINIMIZE: { | 419 case WINDOW_MINIMIZE: { |
417 aura::Window* window = wm::GetActiveWindow(); | 420 aura::Window* window = wm::GetActiveWindow(); |
418 if (window) | 421 if (window) { |
419 wm::MinimizeWindow(window); | 422 wm::MinimizeWindow(window); |
| 423 return true; |
| 424 } |
420 break; | 425 break; |
421 } | 426 } |
422 case WINDOW_MAXIMIZE_RESTORE: { | 427 case WINDOW_MAXIMIZE_RESTORE: { |
423 aura::Window* window = wm::GetActiveWindow(); | 428 aura::Window* window = wm::GetActiveWindow(); |
424 if (window) { | 429 if (window) { |
425 if (wm::IsWindowMaximized(window)) | 430 if (wm::IsWindowMaximized(window)) |
426 wm::RestoreWindow(window); | 431 wm::RestoreWindow(window); |
427 else | 432 else |
428 wm::MaximizeWindow(window); | 433 wm::MaximizeWindow(window); |
| 434 return true; |
429 } | 435 } |
430 break; | 436 break; |
431 } | 437 } |
432 case WINDOW_POSITION_CENTER: { | 438 case WINDOW_POSITION_CENTER: { |
433 aura::Window* window = wm::GetActiveWindow(); | 439 aura::Window* window = wm::GetActiveWindow(); |
434 if (window) | 440 if (window) { |
435 wm::CenterWindow(window); | 441 wm::CenterWindow(window); |
| 442 return true; |
| 443 } |
436 break; | 444 break; |
437 } | 445 } |
438 case ROTATE_WINDOWS: | 446 case ROTATE_WINDOWS: |
439 return HandleRotateWindows(); | 447 return HandleRotateWindows(); |
440 #if !defined(NDEBUG) | 448 #if !defined(NDEBUG) |
441 case ROTATE_SCREEN: | 449 case ROTATE_SCREEN: |
442 return HandleRotateScreen(); | 450 return HandleRotateScreen(); |
443 case TOGGLE_DESKTOP_BACKGROUND_MODE: | 451 case TOGGLE_DESKTOP_BACKGROUND_MODE: |
444 return HandleToggleDesktopBackgroundMode(); | 452 return HandleToggleDesktopBackgroundMode(); |
445 case TOGGLE_ROOT_WINDOW_FULL_SCREEN: | 453 case TOGGLE_ROOT_WINDOW_FULL_SCREEN: |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
490 // Then set this one as active. | 498 // Then set this one as active. |
491 Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index); | 499 Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index); |
492 } | 500 } |
493 } | 501 } |
494 | 502 |
495 bool AcceleratorController::CanHandleAccelerators() const { | 503 bool AcceleratorController::CanHandleAccelerators() const { |
496 return true; | 504 return true; |
497 } | 505 } |
498 | 506 |
499 } // namespace ash | 507 } // namespace ash |
OLD | NEW |