ash/shelf/shelf_layout_manager_unittest.cc - Issue 2241273004: Move kUseNewVKWindowBehavior switch.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 2241273004: Move kUseNewVKWindowBehavior switch. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixes Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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 61823bff62c33f6f1c8e70d434e4e0eccd9f4451..e74c9149015f2b786c07686efd5577e6ed2c7a6d 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"

@@ -2000,9 +2000,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::kUseNewVirtualKeyboardBehavior))

+ command_line->AppendSwitch(::switches::kUseNewVirtualKeyboardBehavior);

}

const gfx::Rect& keyboard_bounds() const { return keyboard_bounds_; }