move switch

content/browser/renderer_host/render_widget_host_view_aura.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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include <set>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 55 matching lines @@
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ime/input_method.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/compositor_vsync_manager.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 #include "ui/events/gestures/gesture_recognizer.h"
@@ skipping 1518 matching lines @@
     size_t before, size_t after) {
   RenderFrameHostImpl* rfh = GetFocusedFrame();
   if (rfh)
     rfh->ExtendSelectionAndDelete(before, after);
 }
 
 void RenderWidgetHostViewAura::EnsureCaretInRect(const gfx::Rect& rect) {
   gfx::Rect intersected_rect(
       gfx::IntersectRects(rect, window_->GetBoundsInScreen()));
 
-  if (intersected_rect.IsEmpty())
+  if (!intersected_rect.IsEmpty())
+    host_->ScrollFocusedEditableNodeIntoRect(
+        ConvertRectFromScreen(intersected_rect));
+
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          ::switches::kUseNewVKWindowBehavior))
     return;
 
-  host_->ScrollFocusedEditableNodeIntoRect(
-      ConvertRectFromScreen(intersected_rect));
+  display::Screen* screen = display::Screen::GetScreen();
+  if (screen->GetPrimaryDisplay().id() !=
+      screen->GetDisplayNearestWindow(window_).id())
+    return;
+
+  aura::Window* top_level_window = window_->GetToplevelWindow();
+
+  if (top_level_window->GetProperty(aura::client::kVKNewBoundsKey)) {
+    top_level_window->ClearProperty(aura::client::kVKNewBoundsKey);
+  } else if (rect != screen->GetPrimaryDisplay().bounds()) {
+    gfx::Rect window_bounds = top_level_window->GetBoundsInRootWindow();
+    int vertical_displacement =
+        std::max(0, window_bounds.bottom() - rect.bottom());
+    int shift = std::min(vertical_displacement, window_bounds.y());
+
+    if (shift > 0) {
+      gfx::Point origin(window_bounds.x(), window_bounds.y() - shift);
+      top_level_window->SetProperty(
+          aura::client::kVKNewBoundsKey,
+          new gfx::Rect(origin, window_bounds.size()));
+    }
+  }
 }
 
 bool RenderWidgetHostViewAura::IsTextEditCommandEnabled(
     ui::TextEditCommand command) const {
   return false;
 }
 
 void RenderWidgetHostViewAura::SetTextEditCommandForNextKeyEvent(
     ui::TextEditCommand command) {}
 
@@ skipping 1423 matching lines @@
     return;
   }
 
   // Set the CLIPBOARD_TYPE_SELECTION to the ui::Clipboard.
   ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_SELECTION);
   clipboard_writer.WriteText(text_selection->text.substr(pos, n));
 #endif  // defined(USE_X11) && !defined(OS_CHROMEOS)
 }
 
 }  // namespace content