| Index: ash/shelf/shelf_layout_manager_unittest.cc
|
| diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
|
| index 13d445f0da448cd2aa6348a303fc60d93cf6e6a8..8afa3a94c0091fae6655551c416495b60d6375cb 100644
|
| --- a/ash/shelf/shelf_layout_manager_unittest.cc
|
| +++ b/ash/shelf/shelf_layout_manager_unittest.cc
|
| @@ -7,7 +7,6 @@
|
| #include "ash/aura/wm_window_aura.h"
|
| #include "ash/common/accelerators/accelerator_controller.h"
|
| #include "ash/common/accelerators/accelerator_table.h"
|
| -#include "ash/common/ash_switches.h"
|
| #include "ash/common/focus_cycler.h"
|
| #include "ash/common/material_design/material_design_controller.h"
|
| #include "ash/common/session/session_state_delegate.h"
|
| @@ -36,6 +35,7 @@
|
| #include "ui/aura/client/window_tree_client.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/aura/window_event_dispatcher.h"
|
| +#include "ui/base/ui_base_switches.h"
|
| #include "ui/compositor/layer.h"
|
| #include "ui/compositor/layer_animator.h"
|
| #include "ui/compositor/scoped_animation_duration_scale_mode.h"
|
| @@ -1969,8 +1969,8 @@ class ShelfLayoutManagerKeyboardTest : public test::AshTestBase {
|
|
|
| void EnableNewVKMode() {
|
| base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| - if (!command_line->HasSwitch(switches::kAshUseNewVKWindowBehavior)) {
|
| - command_line->AppendSwitch(switches::kAshUseNewVKWindowBehavior);
|
| + if (!command_line->HasSwitch(::switches::kUseNewVKWindowBehavior)) {
|
| + command_line->AppendSwitch(::switches::kUseNewVKWindowBehavior);
|
| }
|
| }
|
|
|
|
|