| Index: chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc
|
| index a7f5509dd7835087479f3d83662027027db5b282..09e247eacb774bf608e6d2985df579fd41e9b1d0 100644
|
| --- a/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc
|
| +++ b/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc
|
| @@ -16,6 +16,7 @@
|
| #include "chrome/browser/debugger/devtools_window.h"
|
| #include "chrome/browser/extensions/extension_host.h"
|
| #include "chrome/browser/extensions/extension_process_manager.h"
|
| +#include "chrome/browser/extensions/extension_view.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| @@ -48,7 +49,7 @@ ExtensionPopupGtk::ExtensionPopupGtk(Browser* browser,
|
| host_(host),
|
| anchor_(anchor),
|
| weak_factory_(this) {
|
| - host_->view()->SetContainer(this);
|
| + host_->GetExtensionView()->SetContainer(this);
|
| being_inspected_ = show_action == SHOW_AND_INSPECT;
|
|
|
| // If the host had somehow finished loading, then we'd miss the notification
|
| @@ -138,14 +139,16 @@ void ExtensionPopupGtk::BubbleClosing(BubbleGtk* bubble,
|
| delete this;
|
| }
|
|
|
| -void ExtensionPopupGtk::OnExtensionSizeChanged(
|
| - ExtensionViewGtk* view,
|
| - const gfx::Size& new_size) {
|
| +void ExtensionPopupGtk::OnExtensionSizeChanged(ExtensionView* view,
|
| + const gfx::Size& new_size) {
|
| int width = std::max(kMinWidth, std::min(kMaxWidth, new_size.width()));
|
| int height = std::max(kMinHeight, std::min(kMaxHeight, new_size.height()));
|
|
|
| - view->render_view_host()->GetView()->SetSize(gfx::Size(width, height));
|
| - gtk_widget_set_size_request(view->native_view(), width, height);
|
| + view->GetRenderViewHost()->GetView()->SetSize(gfx::Size(width, height));
|
| + gtk_widget_set_size_request(view->GetNativeView(), width, height);
|
| +}
|
| +
|
| +void ExtensionPopupGtk::OnExtensionViewDidShow(ExtensionView* view) {
|
| }
|
|
|
| bool ExtensionPopupGtk::DestroyPopup() {
|
| @@ -184,7 +187,7 @@ void ExtensionPopupGtk::ShowPopup() {
|
| BubbleGtk::ARROW_LOCATION_TOP_LEFT;
|
| bubble_ = BubbleGtk::Show(anchor_,
|
| NULL,
|
| - host_->view()->native_view(),
|
| + host_->GetExtensionView()->GetNativeView(),
|
| arrow_location,
|
| being_inspected_ ? 0 :
|
| BubbleGtk::POPUP_WINDOW | BubbleGtk::GRAB_INPUT,
|
| @@ -198,6 +201,7 @@ void ExtensionPopupGtk::DestroyPopupWithoutResult() {
|
|
|
| gfx::Rect ExtensionPopupGtk::GetViewBounds() {
|
| GtkAllocation allocation;
|
| - gtk_widget_get_allocation(host_->view()->native_view(), &allocation);
|
| + gtk_widget_get_allocation(host_->GetExtensionView()->GetNativeView(),
|
| + &allocation);
|
| return gfx::Rect(allocation);
|
| }
|
|
|