| Index: ash/accelerators/accelerator_controller.cc
|
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
|
| index 9face4f7a325d8e2f9a46f120c58692b0055f86e..dedda1a69dd1dbf16fe0e585053be5b4619027ac 100644
|
| --- a/ash/accelerators/accelerator_controller.cc
|
| +++ b/ash/accelerators/accelerator_controller.cc
|
| @@ -399,7 +399,7 @@ void AcceleratorController::UnregisterAll(ui::AcceleratorTarget* target) {
|
| }
|
|
|
| bool AcceleratorController::Process(const ui::Accelerator& accelerator) {
|
| - if (ime_control_delegate_.get()) {
|
| + if (ime_control_delegate_) {
|
| return accelerator_manager_->Process(
|
| ime_control_delegate_->RemapAccelerator(accelerator));
|
| }
|
| @@ -570,7 +570,7 @@ bool AcceleratorController::PerformAction(int action,
|
| // Return true to prevent propagation of the key event.
|
| return true;
|
| case TAKE_PARTIAL_SCREENSHOT:
|
| - if (screenshot_delegate_.get()) {
|
| + if (screenshot_delegate_) {
|
| ash::PartialScreenshotView::StartPartialScreenshot(
|
| screenshot_delegate_.get());
|
| }
|
| @@ -622,20 +622,20 @@ bool AcceleratorController::PerformAction(int action,
|
| shell->caps_lock_delegate()->ToggleCapsLock();
|
| return true;
|
| case BRIGHTNESS_DOWN:
|
| - if (brightness_control_delegate_.get())
|
| + if (brightness_control_delegate_)
|
| return brightness_control_delegate_->HandleBrightnessDown(accelerator);
|
| break;
|
| case BRIGHTNESS_UP:
|
| - if (brightness_control_delegate_.get())
|
| + if (brightness_control_delegate_)
|
| return brightness_control_delegate_->HandleBrightnessUp(accelerator);
|
| break;
|
| case KEYBOARD_BRIGHTNESS_DOWN:
|
| - if (keyboard_brightness_control_delegate_.get())
|
| + if (keyboard_brightness_control_delegate_)
|
| return keyboard_brightness_control_delegate_->
|
| HandleKeyboardBrightnessDown(accelerator);
|
| break;
|
| case KEYBOARD_BRIGHTNESS_UP:
|
| - if (keyboard_brightness_control_delegate_.get())
|
| + if (keyboard_brightness_control_delegate_)
|
| return keyboard_brightness_control_delegate_->
|
| HandleKeyboardBrightnessUp(accelerator);
|
| break;
|
| @@ -714,17 +714,17 @@ bool AcceleratorController::PerformAction(int action,
|
| // TODO(mazda): Fix crbug.com/158217
|
| return false;
|
| }
|
| - if (ime_control_delegate_.get())
|
| + if (ime_control_delegate_)
|
| return ime_control_delegate_->HandleNextIme();
|
| break;
|
| case PREVIOUS_IME:
|
| - if (ime_control_delegate_.get())
|
| + if (ime_control_delegate_)
|
| return ime_control_delegate_->HandlePreviousIme();
|
| break;
|
| case PRINT_UI_HIERARCHIES:
|
| return HandlePrintUIHierarchies();
|
| case SWITCH_IME:
|
| - if (ime_control_delegate_.get())
|
| + if (ime_control_delegate_)
|
| return ime_control_delegate_->HandleSwitchIme(accelerator);
|
| break;
|
| case SELECT_WIN_0:
|
|
|