Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5194)

Unified Diff: chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc

Issue 10913243: extensions: Add ExtensionView interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes for Ben Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}

Powered by Google App Engine
This is Rietveld 408576698