Gtk content shell: make the window shrinkable.

content/shell/shell_gtk.cc

 // Copyright (c) 2012 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 "content/shell/shell.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
@@ skipping 83 matching lines @@
   if (headless_)
     return;
 
   if (loading)
     gtk_spinner_start(GTK_SPINNER(spinner_));
   else
     gtk_spinner_stop(GTK_SPINNER(spinner_));
 }
 
 void Shell::PlatformCreateWindow(int width, int height) {
+
+  if (!headless_) {
+    window_ = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
+    gtk_window_set_title(window_, "Content Shell");
+    g_signal_connect(G_OBJECT(window_), "destroy",
+                     G_CALLBACK(OnWindowDestroyedThunk), this);
+  }
   SizeTo(width, height);
 
   if (headless_)
     return;
 
-  window_ = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
-  gtk_window_set_title(window_, "Content Shell");
-  g_signal_connect(G_OBJECT(window_), "destroy",
-                   G_CALLBACK(OnWindowDestroyedThunk), this);
-
   vbox_ = gtk_vbox_new(FALSE, 0);
 
   // Create the menu bar.
   GtkWidget* menu_bar = CreateMenuBar(this);
   gtk_box_pack_start(GTK_BOX(vbox_), menu_bar, FALSE, FALSE, 0);
 
   // Create the object that mediates accelerators.
   GtkAccelGroup* accel_group = gtk_accel_group_new();
   gtk_window_add_accel_group(GTK_WINDOW(window_), accel_group);
 
@@ skipping 78 matching lines @@
   if (headless_)
     return;
 
   WebContentsView* content_view = web_contents_->GetView();
   gtk_container_add(GTK_CONTAINER(vbox_), content_view->GetNativeView());
 }
 
 void Shell::SizeTo(int width, int height) {
   content_width_ = width;
   content_height_ = height;
-  if (web_contents_) {
-    gtk_widget_set_size_request(web_contents_->GetView()->GetNativeView(),
-                                width, height);
-  }
+  if (window_)
+    gtk_window_resize(window_, width, height);

[jochen (gone - plz use gerrit), 2013/05/14 07:25:33]

this will break headless mode where window_ is always NULL

[mstensho (USE GERRIT), 2013/05/14 09:28:24]

So would the right thing be to keep the old code for headless?

I.e. "else if (web_contents_) blahblah..." ?

[jochen (gone - plz use gerrit), 2013/05/14 09:31:39]

Not sure. We always want the native view to be the specified size. So if window_
!= NULL, you need to add the size for the url bar etc..

[mstensho (USE GERRIT), 2013/05/14 09:40:16]

I'm sorry, I don't understand. Can you provide me with a test case for
non-headless mode where my change causes problems?

 }
 
 void Shell::PlatformResizeSubViews() {
   SizeTo(content_width_, content_height_);
 }
 
 void Shell::Close() {
   if (headless_) {
     delete this;
     return;
@@ skipping 64 matching lines @@
 
 void Shell::PlatformSetTitle(const string16& title) {
   if (headless_)
     return;
 
   std::string title_utf8 = UTF16ToUTF8(title);
   gtk_window_set_title(GTK_WINDOW(window_), title_utf8.c_str());
 }
 
 }  // namespace content