Update ConstrainedWindowViews appearance according to mock

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"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/views/constrained_window_frame_simple.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "net/base/net_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/color_constants.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/client_view.h"
+#include "ui/views/window/dialog_client_view.h"
+#include "ui/views/window/dialog_delegate.h"
 #include "ui/views/window/frame_background.h"
 #include "ui/views/window/non_client_view.h"
 #include "ui/views/window/window_resources.h"
 #include "ui/views/window/window_shape.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "ui/base/win/shell.h"
 #include "ui/views/widget/native_widget_win.h"
 #endif
 
@@ skipping 524 matching lines @@
 ConstrainedWindowViews::ConstrainedWindowViews(
     TabContents* tab_contents,
     views::WidgetDelegate* widget_delegate)
     : tab_contents_(tab_contents),
       ALLOW_THIS_IN_INITIALIZER_LIST(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;
-  params.parent = tab_contents->web_contents()->GetNativeView();
+
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kEnableFramelessConstrainedDialogs)) {
+    content::WebContentsView* web_contents_view =
+        tab_contents->web_contents()->GetView();
+    Widget* parent_widget = Widget::GetTopLevelWidgetForNativeView(
+        web_contents_view->GetNativeView());
+    params.parent_widget = parent_widget;
+  } else {
+    params.parent = tab_contents->web_contents()->GetNativeView();
+  }
+
 #if defined(USE_ASH)
   // Ash window headers can be transparent.
   params.transparent = true;
   ash::SetChildWindowVisibilityChangesAnimated(params.parent);
   // 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,
                                          true);
   }
 #endif
   Init(params);
 
+  if (command_line->HasSwitch(switches::kEnableFramelessConstrainedDialogs)) {
+    // Set the dialog background color.
+    if (widget_delegate && widget_delegate->AsDialogDelegate()) {
+      views::Background* background = views::Background::CreateSolidBackground(
+          ConstrainedWindow::GetBackgroundColor());
+      views::DialogClientView* dialog_client_view =
+          widget_delegate->AsDialogDelegate()->GetDialogClientView();
+      if (dialog_client_view)
+        dialog_client_view->set_background(background);
+    }
+
+    // Set the top of the now-centered window to overlap the browser chrome.
+    gfx::Rect bounds = GetRootView()->bounds();
+    Widget::ConvertRect(this, params.parent_widget, &bounds);
+    ConstrainedWindowTabHelperDelegate* tab_helper_delegate =
+        tab_contents->constrained_window_tab_helper()->delegate();
+
+    BrowserWindow* browser_window =
+        tab_helper_delegate ? tab_helper_delegate->GetBrowserWindow() : NULL;
+    if (browser_window && browser_window->GetConstrainedWindowTopY() >= 0) {
+      bounds.set_y(browser_window->GetConstrainedWindowTopY());
+      SetBounds(bounds);

[Ben Goodger (Google), 2012/09/27 16:16:12]

rather than creating at the wrong location the moving, can you pass the correct
bounds to Init via params?

[Mike Wittman, 2012/09/28 22:46:09]

Not easily.  The window centering logic lives within platform-specific code and
wants to operate on both dimensions of a pre-existing window.  It's probably
possible to plumb custom calls down there to compute horizontal-only centering
for a window that doesn't yet exist, but it would add a lot of complexity to
support a situation that's likely a one-off.

[Ben Goodger (Google), 2012/10/01 16:25:57]

But you can construct correct bounds for params earlier in this function, e.g.
near where you set parent and before calling Init()

[Mike Wittman, 2012/10/02 00:07:35]

No, on further inspection I don't see a feasible way to do this.  We need to
know the width of the widget to center it horizontally over the browser window. 
But the width is dependent on the widths of the client and non-client views,
neither of which are created until Init().

+    }
+  }
+
   tab_contents_->constrained_window_tab_helper()->AddConstrainedDialog(this);
 #if defined(USE_ASH)
   GetNativeWindow()->SetProperty(ash::kConstrainedWindowKey, true);
 #endif
 }
 
 ConstrainedWindowViews::~ConstrainedWindowViews() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 71 matching lines @@
 
 views::internal::NativeWidgetDelegate*
     ConstrainedWindowViews::AsNativeWidgetDelegate() {
   return this;
 }
 
 int ConstrainedWindowViews::GetNonClientComponent(const gfx::Point& point) {
   // Prevent a constrained window to be moved by the user.
   return HTNOWHERE;
 }