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

Unified Diff: ash/shelf/shelf_layout_manager.cc

Issue 2871243003: Enable new-virtual-keyboard-behavior flag by default. (Closed)
Patch Set: rebase 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
Index: ash/shelf/shelf_layout_manager.cc
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
index 19deab0a039b3bbec21e718d8e84468befbb781a..de2340951ba936934db0b11b5176f0517d2940cb 100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/shelf/shelf_layout_manager.cc
@@ -432,9 +432,10 @@ void ShelfLayoutManager::OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) {
// If new window behavior flag enabled and in non-sticky mode, do not change
// the work area.
bool change_work_area =
- (!base::CommandLine::ForCurrentProcess()->HasSwitch(
- ::switches::kUseNewVirtualKeyboardBehavior) ||
- keyboard::KeyboardController::GetInstance()->keyboard_locked());
+ (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ ::switches::kDisableNewVirtualKeyboardBehavior) ||
+ (keyboard::KeyboardController::GetInstance() &&
+ keyboard::KeyboardController::GetInstance()->keyboard_locked()));
keyboard_bounds_ = new_bounds;
LayoutShelfAndUpdateBounds(change_work_area);
« no previous file with comments | « no previous file | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | ash/shelf/shelf_layout_manager_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698