Virtual keyboard - do not change work area of screen if in non-sticky mode.

ash/common/wm/workspace/workspace_layout_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/wm/workspace/workspace_layout_manager.h"
 
 #include <algorithm>

[oshima, 2016/07/22 23:45:01]

new line between c++ include and chrome includes.

[hariank, 2016/07/27 20:38:38]

Done.

-
+#include "ash/common/ash_switches.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm/always_on_top_controller.h"
 #include "ash/common/wm/fullscreen_window_finder.h"
 #include "ash/common/wm/window_positioner.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
 #include "ash/common/wm/workspace/workspace_layout_manager_delegate.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/common/wm_window_property.h"
+#include "base/command_line.h"
 #include "ui/compositor/layer.h"
+#include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 
 namespace ash {
 
 WorkspaceLayoutManager::WorkspaceLayoutManager(
     WmWindow* window,
     std::unique_ptr<wm::WorkspaceLayoutManagerDelegate> delegate)
     : window_(window),
       root_window_(window->GetRootWindow()),
       root_window_controller_(root_window_->GetRootWindowController()),
@@ skipping 102 matching lines @@
     return;
 
   window = window->GetToplevelWindow();
   if (!window_->Contains(window))
     return;
 
   wm::WindowState* window_state = window->GetWindowState();
   if (window_state->ignore_keyboard_bounds_change())
     return;
 
-  if (!new_bounds.IsEmpty()) {
+  // 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::kAshUseNewVKWindowBehavior) ||
+       keyboard::KeyboardController::GetInstance()->get_lock_keyboard());

[oshima, 2016/07/22 23:45:01]

if think this method will be gone with new mode, (or does completely different
thing), so you can just check it at the beginning of the method, and just return
if !change_work_area.

[hariank, 2016/07/27 20:38:39]

Done.

+
+  if (!new_bounds.IsEmpty() && change_work_area) {
     // Store existing bounds to be restored before resizing for keyboard if it
     // is not already stored.
     if (!window_state->HasRestoreBounds())
       window_state->SaveCurrentBoundsForRestore();
 
     gfx::Rect window_bounds =
         window_->ConvertRectToScreen(window->GetTargetBounds());
     int vertical_displacement =
         std::max(0, window_bounds.bottom() - new_bounds.y());
     int shift = std::min(vertical_displacement,
@@ skipping 205 matching lines @@
   for (auto* window : windows) {
     wm::WindowState* window_state = window->GetWindowState();
     if (window_on_top)
       window_state->DisableAlwaysOnTop(window_on_top);
     else
       window_state->RestoreAlwaysOnTop();
   }
 }
 
 }  // namespace ash