Reland Fix Views web-modal dialog widget creation.

chrome/browser/ui/views/desktop_media_picker_views.cc

 // Copyright 2013 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/media/desktop_media_picker.h"
 
 #include "base/callback.h"
 #include "chrome/browser/media/desktop_media_list.h"
 #include "chrome/browser/media/desktop_media_list_observer.h"
 #include "chrome/browser/ui/ash/ash_util.h"
-#include "components/web_modal/web_contents_modal_dialog_host.h"
+#include "chrome/browser/ui/views/constrained_window_views.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
-#include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/generated_resources.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "ui/wm/core/shadow_types.h"
 
 using content::DesktopMediaID;
-using web_modal::WebContentsModalDialogManager;
-using web_modal::WebContentsModalDialogManagerDelegate;
 
 namespace {
 
 const int kThumbnailWidth = 160;
 const int kThumbnailHeight = 100;
 const int kThumbnailMargin = 10;
 const int kLabelHeight = 40;
 const int kListItemWidth = kThumbnailMargin * 2 + kThumbnailWidth;
 const int kListItemHeight =
     kThumbnailMargin * 2 + kThumbnailHeight + kLabelHeight;
@@ skipping 121 matching lines @@
 
   // Called by DesktopMediaListView.
   void OnSelectionChanged();
   void OnDoubleClick();
 
   // views::View overrides.
   virtual gfx::Size GetPreferredSize() const OVERRIDE;
   virtual void Layout() OVERRIDE;
 
   // views::DialogDelegateView overrides.
+  virtual ui::ModalType GetModalType() const OVERRIDE;
   virtual base::string16 GetWindowTitle() const OVERRIDE;
   virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE;
   virtual base::string16 GetDialogButtonLabel(
       ui::DialogButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
 
  private:
   DesktopMediaPickerViews* parent_;
   base::string16 app_name_;
@@ skipping 330 matching lines @@
   AddChildView(label_);
 
   scroll_view_->SetContents(list_view_);
   AddChildView(scroll_view_);
 
   // If |parent_web_contents| is set, the picker will be shown modal to the
   // web contents. Otherwise, a new dialog widget inside |parent_window| will be
   // created for the picker. Note that |parent_window| may also be NULL if
   // parent web contents is not set. In this case the picker will be parented
   // by a root window.
-  WebContentsModalDialogManager* web_contents_modal_dialog_manager = NULL;
-  if (parent_web_contents) {
-    web_contents_modal_dialog_manager =
-        WebContentsModalDialogManager::FromWebContents(parent_web_contents);
-    DCHECK(web_contents_modal_dialog_manager);
-    WebContentsModalDialogManagerDelegate* delegate =
-        web_contents_modal_dialog_manager->delegate();
-    DCHECK(delegate);
-    views::Widget::CreateWindowAsFramelessChild(
-        this,
-        delegate->GetWebContentsModalDialogHost()->GetHostView());
-  } else {
-    DialogDelegate::CreateDialogWidget(this, context, parent_window);
-  }
+  views::Widget* widget = NULL;
+  if (parent_web_contents)
+    widget = CreateWebModalDialogViews(this, parent_web_contents);
+  else
+    widget = DialogDelegate::CreateDialogWidget(this, context, parent_window);
 
   // DesktopMediaList needs to know the ID of the picker window which
   // matches the ID it gets from the OS. Depending on the OS and configuration
   // we get this ID differently.
   content::DesktopMediaID::Id dialog_window_id = 0;
-
 #if defined(USE_ASH)
-  if (chrome::IsNativeWindowInAsh(GetWidget()->GetNativeWindow())) {
+  if (chrome::IsNativeWindowInAsh(widget->GetNativeWindow())) {
     dialog_window_id = content::DesktopMediaID::RegisterAuraWindow(
-        GetWidget()->GetNativeWindow()).id;
-  } else
+        widget->GetNativeWindow()).id;
+    DCHECK_NE(dialog_window_id, 0);
+  }
 #endif
-  {
+  if (dialog_window_id == 0) {
     dialog_window_id = AcceleratedWidgetToDesktopMediaId(
-        GetWidget()->GetNativeWindow()->GetHost()->
-            GetAcceleratedWidget());
+        widget->GetNativeWindow()->GetHost()->GetAcceleratedWidget());
   }
 
   list_view_->StartUpdating(dialog_window_id);
 
   if (parent_web_contents) {
-    web_contents_modal_dialog_manager->ShowModalDialog(
-        GetWidget()->GetNativeView());
+    web_modal::WebContentsModalDialogManager* manager =
+        web_modal::WebContentsModalDialogManager::FromWebContents(
+            parent_web_contents);
+    manager->ShowModalDialog(widget->GetNativeView());
   } else {
-    GetWidget()->Show();
+    widget->Show();
   }
 }
 
 DesktopMediaPickerDialogView::~DesktopMediaPickerDialogView() {}
 
 void DesktopMediaPickerDialogView::DetachParent() {
   parent_ = NULL;
 }
 
 gfx::Size DesktopMediaPickerDialogView::GetPreferredSize() const {
   return gfx::Size(600, 500);
 }
 
 void DesktopMediaPickerDialogView::Layout() {
   gfx::Rect rect = GetLocalBounds();
   rect.Inset(views::kPanelHorizMargin, views::kPanelVertMargin);
 
   gfx::Rect label_rect(rect.x(), rect.y(), rect.width(),
                        label_->GetHeightForWidth(rect.width()));
   label_->SetBoundsRect(label_rect);
 
   int scroll_view_top = label_rect.bottom() + views::kPanelVerticalSpacing;
   scroll_view_->SetBounds(
       rect.x(), scroll_view_top,
       rect.width(), rect.height() - scroll_view_top);
 }
 
+ui::ModalType DesktopMediaPickerDialogView::GetModalType() const {
+  return ui::MODAL_TYPE_CHILD;
+}
+
 base::string16 DesktopMediaPickerDialogView::GetWindowTitle() const {
   return l10n_util::GetStringFUTF16(IDS_DESKTOP_MEDIA_PICKER_TITLE, app_name_);
 }
 
 bool DesktopMediaPickerDialogView::IsDialogButtonEnabled(
     ui::DialogButton button) const {
   if (button == ui::DIALOG_BUTTON_OK)
     return list_view_->GetSelection() != NULL;
   return true;
 }
@@ skipping 30 matching lines @@
 
 void DesktopMediaPickerDialogView::OnSelectionChanged() {
   GetDialogClientView()->UpdateDialogButtons();
 }
 
 void DesktopMediaPickerDialogView::OnDoubleClick() {
   // This will call Accept() and close the dialog.
   GetDialogClientView()->AcceptWindow();
 }
 
-DesktopMediaPickerViews::DesktopMediaPickerViews()
-    : dialog_(NULL) {
+DesktopMediaPickerViews::DesktopMediaPickerViews() : dialog_(NULL) {
 }
 
 DesktopMediaPickerViews::~DesktopMediaPickerViews() {
   if (dialog_) {
     dialog_->DetachParent();
     dialog_->GetWidget()->Close();
   }
 }
 
 void DesktopMediaPickerViews::Show(content::WebContents* web_contents,
                                    gfx::NativeWindow context,
                                    gfx::NativeWindow parent,
                                    const base::string16& app_name,
                                    const base::string16& target_name,
                                    scoped_ptr<DesktopMediaList> media_list,
                                    const DoneCallback& done_callback) {
   callback_ = done_callback;
   dialog_ = new DesktopMediaPickerDialogView(
       web_contents, context, parent, this, app_name, target_name,
       media_list.Pass());
 }
 
-void DesktopMediaPickerViews::NotifyDialogResult(
-    DesktopMediaID source) {
+void DesktopMediaPickerViews::NotifyDialogResult(DesktopMediaID source) {
   // Once this method is called the |dialog_| will close and destroy itself.
   dialog_->DetachParent();
   dialog_ = NULL;
 
   DCHECK(!callback_.is_null());
 
   // Notify the |callback_| asynchronously because it may need to destroy
   // DesktopMediaPicker.
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(callback_, source));
   callback_.Reset();
 }
 
 }  // namespace
 
 // static
 scoped_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
   return scoped_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());
 }