summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-18 00:09:09 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-18 00:09:09 +0000
commit30138a899711b9e075cd73a9e704ce858ecefdd5 (patch)
tree34dbb5d03fd16e2c6f7dc1cc6c23917b40bf7825 /chrome
parentfbd6d792accf142ef6ad188b0fd9ac09d370d80a (diff)
downloadchromium_src-30138a899711b9e075cd73a9e704ce858ecefdd5.zip
chromium_src-30138a899711b9e075cd73a9e704ce858ecefdd5.tar.gz
chromium_src-30138a899711b9e075cd73a9e704ce858ecefdd5.tar.bz2
Allow the RenderWidgetHostViewGtk to be sized even if it isn't a popup.
browser/views/tab_contents/tab_contents_view_gtk.cc implements sizing in a similar fashion to windows - i.e. when the GtkWidget is resized, it tells the RenderViewHost that it was sized, which causes the RVH to resize the view. A check for if (parent_) in the Gtk RenderWidgetHostView impl was preventing this sizing from occurring. BUG=none TEST=none Review URL: http://codereview.chromium.org/125275 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18670 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/renderer_host/render_widget_host_view_gtk.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
index 7a55322..73b60c9 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -316,11 +316,20 @@ void RenderWidgetHostViewGtk::SetSize(const gfx::Size& size) {
// If we are a popup, we want to handle this.
// TODO(estade): are there other situations where we want to respect the
// request?
+#if !defined(TOOLKIT_VIEWS)
if (parent_) {
+#else
+ // TOOLKIT_VIEWS' resize logic flow matches windows. When the container widget
+ // is resized, it calls RWH::WasSized, which sizes this widget using SetSize.
+ // TODO(estade): figure out if the logic flow here can be normalized across
+ // platforms
+#endif
gtk_widget_set_size_request(view_.get(),
std::min(size.width(), kMaxWindowWidth),
std::min(size.height(), kMaxWindowHeight));
+#if !defined(TOOLKIT_VIEWS)
}
+#endif
}
gfx::NativeView RenderWidgetHostViewGtk::GetNativeView() {