Addition of 'maxSize' to experimental popup extension API.

chrome/browser/ui/views/extensions/extension_popup.cc

 // Copyright (c) 2009 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/views/extensions/extension_popup.h"
 
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/debugger/devtools_toggle_action.h"
@@ skipping 16 matching lines @@
 #include "views/widget/widget_gtk.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "cros/chromeos_wm_ipc_enums.h"
 #endif
 
 using views::Widget;
 
-// The minimum/maximum dimensions of the popup.
+// The minimum, and default maximum dimensions of the popup.
 // The minimum is just a little larger than the size of the button itself.
-// The maximum is an arbitrary number that should be smaller than most screens.
+// The default maximum is an arbitrary number that should be smaller than most
+// screens.
 const int ExtensionPopup::kMinWidth = 25;
 const int ExtensionPopup::kMinHeight = 25;
 const int ExtensionPopup::kMaxWidth = 800;
 const int ExtensionPopup::kMaxHeight = 600;
 
 namespace {
 
 // The width, in pixels, of the black-border on a popup.
 const int kPopupBorderWidth = 1;
 
@@ skipping 19 matching lines @@
       relative_to_(relative_to),
       extension_host_(host),
       activate_on_show_(activate_on_show),
       inspect_with_devtools_(inspect_with_devtools),
       close_on_lost_focus_(true),
       closing_(false),
       border_widget_(NULL),
       border_(NULL),
       border_view_(NULL),
       popup_chrome_(chrome),
+      max_size_(kMaxWidth, kMaxHeight),
       observer_(observer),
       anchor_position_(arrow_location),
       instance_lifetime_(new InternalRefCounter()){
   AddRef();  // Balanced in Close();
   set_delegate(this);
   host->view()->SetContainer(this);
 
   // We wait to show the popup until the contained host finishes loading.
   registrar_.Add(this,
                  NotificationType::EXTENSION_HOST_DID_STOP_LOADING,
@@ skipping 193 matching lines @@
 
       break;
     default:
       NOTREACHED() << L"Received unexpected notification";
   }
 }
 
 void ExtensionPopup::OnExtensionPreferredSizeChanged(ExtensionView* view) {
   // Constrain the size to popup min/max.
   gfx::Size sz = view->GetPreferredSize();
+
   view->SetBounds(view->x(), view->y(),
-      std::max(kMinWidth, std::min(kMaxWidth, sz.width())),
-      std::max(kMinHeight, std::min(kMaxHeight, sz.height())));
+      std::max(kMinWidth, std::min(max_size_.width(), sz.width())),
+      std::max(kMinHeight, std::min(max_size_.height(), sz.height())));
 
   // If popup_chrome_ == RECTANGLE_CHROME, the border is drawn in the client
   // area of the ExtensionView, rather than in a window which sits behind it.
   // In this case, the actual size of the view must be enlarged so that the
   // web contents portion of the view gets its full PreferredSize area.
   if (view->border()) {
     gfx::Insets border_insets;
     view->border()->GetInsets(&border_insets);
 
     gfx::Rect bounds(view->bounds());
@@ skipping 75 matching lines @@
 
   ExtensionHost* host = manager->CreatePopup(url, browser);
   if (observer)
     observer->ExtensionHostCreated(host);
 
   ExtensionPopup* popup = new ExtensionPopup(host, frame_widget, relative_to,
                                              arrow_location, activate_on_show,
                                              inspect_with_devtools, chrome,
                                              observer);
 
+  if (observer)
+    observer->ExtensionPopupCreated(popup);
+
   // If the host had somehow finished loading, then we'd miss the notification
   // and not show.  This seems to happen in single-process mode.
   if (host->did_stop_loading())
     popup->Show(activate_on_show);
 
   return popup;
 }
 
 void ExtensionPopup::Close() {
   if (closing_)
@@ skipping 14 matching lines @@
     DCHECK(closing_) << "ExtensionPopup to be destroyed before being closed.";
     ExtensionPopup::Observer* observer = observer_;
     delete this;
 
     // |this| is passed only as a 'cookie'. The observer API explicitly takes a
     // void* argument to emphasize this.
     if (observer)
       observer->ExtensionPopupClosed(this);
   }
 }