[Reland] [Media Router] Enable autoresizing for the Media Router dialog for Mac.

chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc

 // Copyright 2015 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/webui/media_router/media_router_dialog_controller_impl.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 23 matching lines @@
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(
     media_router::MediaRouterDialogControllerImpl);
 
 using content::LoadCommittedDetails;
 using content::NavigationController;
 using content::WebContents;
 using content::WebUIMessageHandler;
 using ui::WebDialogDelegate;
 
 namespace {
-#if defined(OS_MACOSX)
-const int kFixedHeight = 350;
-#else
 const int kMaxHeight = 2000;
 const int kMinHeight = 80;
-#endif
 const int kWidth = 340;
 }
 
 namespace media_router {
 
 namespace {
 
 // WebDialogDelegate that specifies what the Media Router dialog
 // will look like.
 class MediaRouterDialogDelegate : public WebDialogDelegate {
@@ skipping 47 matching lines @@
 
  private:
   base::WeakPtr<MediaRouterAction> action_;
   base::WeakPtr<MediaRouterDialogControllerImpl> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterDialogDelegate);
 };
 
 void MediaRouterDialogDelegate::GetDialogSize(gfx::Size* size) const {
   DCHECK(size);
-  // TODO(apacible): Remove after autoresizing is implemented for OSX.
-#if defined(OS_MACOSX)
-  *size = gfx::Size(kWidth, kFixedHeight);
-#else
   // GetDialogSize() is called when the browser window resizes. We may want to
   // update the maximum height of the dialog and scale the WebUI to the new
   // height. |size| is not set because the dialog is auto-resizeable.
   controller_->UpdateMaxDialogSize();
-#endif
 }
 
 }  // namespace
 
 // static
 MediaRouterDialogControllerImpl*
 MediaRouterDialogControllerImpl::GetOrCreateForWebContents(
     WebContents* web_contents) {
   DCHECK(web_contents);
   // This call does nothing if the controller already exists.
@@ skipping 100 matching lines @@
 void MediaRouterDialogControllerImpl::CreateMediaRouterDialog() {
   DCHECK(!dialog_observer_.get());
 
   base::Time dialog_creation_time = base::Time::Now();
   TRACE_EVENT_NESTABLE_ASYNC_BEGIN0("media_router", "UI", initiator());
 
   Profile* profile =
       Profile::FromBrowserContext(initiator()->GetBrowserContext());
   DCHECK(profile);
 
+  // |web_dialog_delegate|'s owner is |constrained_delegate|.
+  // |constrained_delegate| is owned by the parent |views::View|.
   WebDialogDelegate* web_dialog_delegate =
       new MediaRouterDialogDelegate(action_, weak_ptr_factory_.GetWeakPtr());
-  // |web_dialog_delegate|'s owner is |constrained_delegate|.
-  // |constrained_delegate| is owned by the parent |views::View|.
-  // TODO(apacible): Remove after autoresizing is implemented for OSX.
-#if defined(OS_MACOSX)
-  ConstrainedWebDialogDelegate* constrained_delegate =
-      ShowConstrainedWebDialog(profile, web_dialog_delegate, initiator());
-#else
-  // TODO(apacible): Adjust min and max sizes based on new WebUI design.
-  gfx::Size min_size = gfx::Size(kWidth, kMinHeight);
-  gfx::Size max_size = gfx::Size(kWidth, kMaxHeight);
 
   // |ShowConstrainedWebDialogWithAutoResize()| will end up creating
   // ConstrainedWebDialogDelegateViewViews containing a WebContents containing
   // the MediaRouterUI, using the provided |web_dialog_delegate|. Then, the
   // view is shown as a modal dialog constrained to the |initiator| WebContents.
-  // The dialog will resize between the |min_size| and |max_size| bounds based
-  // on the currently rendered contents.
+  // The dialog will resize between the given minimum and maximum size bounds
+  // based on the currently rendered contents.
   ConstrainedWebDialogDelegate* constrained_delegate =
       ShowConstrainedWebDialogWithAutoResize(
-          profile, web_dialog_delegate, initiator(), min_size, max_size);
-#endif
+          profile, web_dialog_delegate, initiator(),
+              gfx::Size(kWidth, kMinHeight), gfx::Size(kWidth, kMaxHeight));
 
   WebContents* media_router_dialog = constrained_delegate->GetWebContents();
   TRACE_EVENT_NESTABLE_ASYNC_INSTANT1("media_router", "UI", initiator(),
                                       "WebContents created",
                                       media_router_dialog);
 
   // |media_router_ui| is created when |constrained_delegate| is created.
   // For tests, GetWebUI() returns a nullptr.
   if (media_router_dialog->GetWebUI()) {
     MediaRouterUI* media_router_ui = static_cast<MediaRouterUI*>(
@@ skipping 58 matching lines @@
           ->GetWeakPtr();
   if (!create_connection_request.get()) {
     media_router_ui->InitWithDefaultMediaSource(delegate);
   } else {
     media_router_ui->InitWithPresentationSessionRequest(
         initiator(), delegate, std::move(create_connection_request));
   }
 }
 
 }  // namespace media_router