Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(615)

Unified Diff: ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc

Issue 2871243003: Enable new-virtual-keyboard-behavior flag by default. (Closed)
Patch Set: keep sorted the declarations Created 3 years, 7 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager.cc ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc
diff --git a/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc b/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc
index db3ba59ff46a88d0c913e5932794bcb99374c01f..67a1d388ac7969b126bae7662b173e481b1e8467 100644
--- a/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc
+++ b/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc
@@ -83,10 +83,13 @@ class WorkspaceLayoutManagerKeyboardTest2 : public test::AshTestBase {
work_area.width(), work_area.height() / 2);
}
- void EnableNewVKMode() {
+ void DisableNewVKMode() {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
- if (!command_line->HasSwitch(::switches::kUseNewVirtualKeyboardBehavior))
- command_line->AppendSwitch(::switches::kUseNewVirtualKeyboardBehavior);
+ if (!command_line->HasSwitch(
+ ::switches::kDisableNewVirtualKeyboardBehavior)) {
+ command_line->AppendSwitch(
+ ::switches::kDisableNewVirtualKeyboardBehavior);
+ }
}
const gfx::Rect& keyboard_bounds() const { return keyboard_bounds_; }
@@ -100,6 +103,9 @@ class WorkspaceLayoutManagerKeyboardTest2 : public test::AshTestBase {
};
TEST_F(WorkspaceLayoutManagerKeyboardTest2, ChangeWorkAreaInNonStickyMode) {
+ // Append the flag to cause work area change in non-sticky mode.
+ DisableNewVKMode();
+
keyboard::SetAccessibilityKeyboardEnabled(true);
InitKeyboardBounds();
Shell::Get()->CreateKeyboard();
@@ -149,9 +155,6 @@ TEST_F(WorkspaceLayoutManagerKeyboardTest2, ChangeWorkAreaInNonStickyMode) {
// keyboard work area in non-sticky mode.
TEST_F(WorkspaceLayoutManagerKeyboardTest2,
IgnoreWorkAreaChangeinNonStickyMode) {
- // Append flag to ignore work area change in non-sticky mode.
- EnableNewVKMode();
-
keyboard::SetAccessibilityKeyboardEnabled(true);
InitKeyboardBounds();
Shell::Get()->CreateKeyboard();
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager.cc ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698