Chromium Code Reviews| Index: ash/common/wm/workspace/workspace_layout_manager.cc |
| diff --git a/ash/common/wm/workspace/workspace_layout_manager.cc b/ash/common/wm/workspace/workspace_layout_manager.cc |
| index 3ea9ddba4b2c59a5efc7c9fa798d98844451d804..f3d771bd0cb1b0a26d4d9605f2949c478641749f 100644 |
| --- a/ash/common/wm/workspace/workspace_layout_manager.cc |
| +++ b/ash/common/wm/workspace/workspace_layout_manager.cc |
| @@ -6,7 +6,6 @@ |
| #include <algorithm> |
| -#include "ash/common/ash_switches.h" |
| #include "ash/common/session/session_state_delegate.h" |
| #include "ash/common/shelf/wm_shelf.h" |
| #include "ash/common/shell_window_ids.h" |
| @@ -22,6 +21,7 @@ |
| #include "ash/common/wm_window.h" |
| #include "ash/common/wm_window_property.h" |
| #include "base/command_line.h" |
| +#include "ui/base/ui_base_switches.h" |
| #include "ui/compositor/layer.h" |
| #include "ui/keyboard/keyboard_controller.h" |
| #include "ui/keyboard/keyboard_controller_observer.h" |
| @@ -131,7 +131,7 @@ void WorkspaceLayoutManager::OnKeyboardBoundsChanging( |
| // the work area. |
| bool change_work_area = |
| (!base::CommandLine::ForCurrentProcess()->HasSwitch( |
| - switches::kAshUseNewVKWindowBehavior) || |
| + ::switches::kUseNewVKWindowBehavior) || |
|
sky
2016/08/19 03:05:36
I've commented on this before, but VK is obscure.
hariank
2016/08/19 17:27:20
Done.
|
| keyboard::KeyboardController::GetInstance()->get_lock_keyboard()); |
| if (!change_work_area) |
| return; |