Make Web Intents picker in Views conform to latest mocks

chrome/browser/ui/views/constrained_window_views.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 "chrome/browser/ui/views/constrained_window_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 566 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindowViews, public:
 
 ConstrainedWindowViews::ConstrainedWindowViews(
     content::WebContents* web_contents,
     views::WidgetDelegate* widget_delegate,
     bool enable_chrome_style)
     : WebContentsObserver(web_contents),
       web_contents_(web_contents),
-      ALLOW_THIS_IN_INITIALIZER_LIST(native_constrained_window_(
-          NativeConstrainedWindow::CreateNativeConstrainedWindow(this))),
-      enable_chrome_style_(enable_chrome_style) {
+      enable_chrome_style_(enable_chrome_style),
+      custom_client_insets_(false) {
+  InitConstrainedWindowViews(widget_delegate);
+}
+
+ConstrainedWindowViews::ConstrainedWindowViews(
+    content::WebContents* web_contents,
+    views::WidgetDelegate* widget_delegate,
+    bool enable_chrome_style,
+    const gfx::Insets& client_insets)
+    : WebContentsObserver(web_contents),
+      web_contents_(web_contents),
+      enable_chrome_style_(enable_chrome_style),
+      custom_client_insets_(true),
+      client_insets_(client_insets) {
+  InitConstrainedWindowViews(widget_delegate);
+}
+
+void ConstrainedWindowViews::InitConstrainedWindowViews(
+    views::WidgetDelegate* widget_delegate) {
+  native_constrained_window_ =
+      NativeConstrainedWindow::CreateNativeConstrainedWindow(this);
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.delegate = widget_delegate;
   params.native_widget = native_constrained_window_->AsNativeWidget();
   params.child = true;
 
   if (enable_chrome_style_) {
     params.parent_widget = Widget::GetTopLevelWidgetForNativeView(
-        web_contents->GetView()->GetNativeView());
+        web_contents_->GetView()->GetNativeView());
   } else {
-    params.parent = web_contents->GetNativeView();
+    params.parent = web_contents_->GetNativeView();
   }
 
 #if defined(USE_ASH)
   // Ash window headers can be transparent.
   params.transparent = true;
   ash::SetChildWindowVisibilityChangesAnimated(params.GetParent());
   // No animations should get performed on the window since that will re-order
   // the window stack which will then cause many problems.
   if (params.parent && params.parent->parent()) {
     params.parent->parent()->SetProperty(aura::client::kAnimationsDisabledKey,
@@ skipping 78 matching lines @@
 // ConstrainedWindowViews, views::Widget overrides:
 
 void ConstrainedWindowViews::CenterWindow(const gfx::Size& size) {
   Widget::CenterWindow(size);
   if (enable_chrome_style_)
     PositionChromeStyleWindow();
 }
 
 views::NonClientFrameView* ConstrainedWindowViews::CreateNonClientFrameView() {
   if (enable_chrome_style_) {
-    return new ConstrainedWindowFrameSimple(this);
+    ConstrainedWindowFrameSimple* frame =
+        new ConstrainedWindowFrameSimple(this);
+    if (custom_client_insets_) {
+      frame->set_border(views::Border::CreateEmptyBorder(
+          client_insets_.top(),
+          client_insets_.left(),
+          client_insets_.bottom(),
+          client_insets_.right()));
+    }
+    return frame;
   } else {
 #if defined(USE_ASH)
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     if (command_line->HasSwitch(ash::switches::kAuraGoogleDialogFrames))
       return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(this);
     ConstrainedWindowFrameViewAsh* frame = new ConstrainedWindowFrameViewAsh;
     frame->Init(this);
     return frame;
 #endif
     return new ConstrainedWindowFrameView(this);
@@ skipping 38 matching lines @@
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindowViews, content::WebContentsObserver implementation:
 
 void ConstrainedWindowViews::WebContentsDestroyed(
     content::WebContents* web_contents) {
   web_contents_ = NULL;
 }