| Index: ash/accelerators/accelerator_controller.cc
|
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
|
| index b7a51cfb50a6a5ea6b9fa8f107c11f879a592fe9..f89a4aa19f8b98a76fe3aa28acf3d6fc5eefff66 100644
|
| --- a/ash/accelerators/accelerator_controller.cc
|
| +++ b/ash/accelerators/accelerator_controller.cc
|
| @@ -67,7 +67,6 @@
|
| #include "ui/events/event.h"
|
| #include "ui/events/keycodes/keyboard_codes.h"
|
| #include "ui/gfx/screen.h"
|
| -#include "ui/oak/oak.h"
|
| #include "ui/views/controls/webview/webview.h"
|
| #include "ui/views/debug_utils.h"
|
| #include "ui/views/widget/widget.h"
|
| @@ -455,15 +454,6 @@ void HandleShowMessageCenterBubble() {
|
| }
|
| }
|
|
|
| -bool HandleShowOak() {
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kAshEnableOak)) {
|
| - oak::ShowOakWindowWithContext(Shell::GetPrimaryRootWindow());
|
| - return true;
|
| - }
|
| - return false;
|
| -}
|
| -
|
| bool HandleShowSystemTrayBubble() {
|
| base::RecordAction(UserMetricsAction("Accel_Show_System_Tray_Bubble"));
|
| internal::RootWindowController* controller =
|
| @@ -1039,8 +1029,6 @@ bool AcceleratorController::PerformAction(int action,
|
| return HandleRotatePaneFocus(Shell::BACKWARD);
|
| case SHOW_KEYBOARD_OVERLAY:
|
| return HandleShowKeyboardOverlay();
|
| - case SHOW_OAK:
|
| - return HandleShowOak();
|
| case SHOW_SYSTEM_TRAY_BUBBLE:
|
| return HandleShowSystemTrayBubble();
|
| case SHOW_MESSAGE_CENTER_BUBBLE:
|
|
|