Add a first attempt at a compact location bar and a status bar. The status ba...

chrome/browser/gtk/browser_window_gtk.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/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
 #include "app/resource_bundle.h"
@@ skipping 48 matching lines @@
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 
 #if defined(OS_CHROMEOS)
+#include "chrome/browser/views/compact_navigation_bar.h"
+#include "chrome/browser/views/frame/status_area_view.h"
 #include "chrome/browser/views/panel_controller.h"
 #include "chrome/browser/views/tabs/tab_overview_types.h"
+#include "views/widget/widget_gtk.h"
+
+#define COMPACT_NAV_BAR
 #endif
 
 namespace {
 
 // The number of milliseconds between loading animation frames.
 const int kLoadingAnimationFrameTimeMs = 30;
 
 // Default offset of the contents splitter in pixels.
 const int kDefaultContentsSplitOffset = 400;
 
@@ skipping 299 matching lines @@
 
 }  // namespace
 
 std::map<XID, GtkWindow*> BrowserWindowGtk::xid_map_;
 
 BrowserWindowGtk::BrowserWindowGtk(Browser* browser)
     :  browser_(browser),
 #if defined(OS_CHROMEOS)
        drag_active_(false),
        panel_controller_(NULL),
+       compact_navigation_bar_(NULL),
+       status_area_(NULL),
 #endif
        frame_cursor_(NULL),
        is_active_(true),
        last_click_time_(0),
        maximize_after_show_(false) {
   use_custom_frame_.Init(prefs::kUseCustomChromeFrame,
       browser_->profile()->GetPrefs(), this);
 
   window_ = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
   g_object_set_data(G_OBJECT(window_), kBrowserWindowKey, this);
@@ skipping 890 matching lines @@
   gtk_widget_set_redraw_on_allocate(window_container_, TRUE);
   g_signal_connect(G_OBJECT(window_container_), "expose-event",
                    G_CALLBACK(&OnCustomFrameExpose), this);
   gtk_container_add(GTK_CONTAINER(window_container_), window_vbox);
 
   tabstrip_.reset(new TabStripGtk(browser_->tabstrip_model()));
   tabstrip_->Init();
 
   // Build the titlebar (tabstrip + header space + min/max/close buttons).
   titlebar_.reset(new BrowserTitlebar(this, window_));
+
+#if defined(OS_CHROMEOS) && defined(COMPACT_NAV_BAR)
+  // Make a box that we'll later insert the compact navigation bar into. The
+  // tabstrip must go into an hbox with our box so that they can get arranged
+  // horizontally.
+  GtkWidget* titlebar_hbox = gtk_hbox_new(FALSE, 0);
+  GtkWidget* navbar_hbox = gtk_hbox_new(FALSE, 0);
+  GtkWidget* status_hbox = gtk_hbox_new(FALSE, 0);
+  gtk_widget_show(navbar_hbox);
+  gtk_widget_show(titlebar_hbox);
+  gtk_widget_show(status_hbox);
+  gtk_box_pack_start(GTK_BOX(titlebar_hbox), navbar_hbox, FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(titlebar_hbox), titlebar_->widget(), TRUE, TRUE,
+                     0);
+  gtk_box_pack_start(GTK_BOX(titlebar_hbox), status_hbox, FALSE, FALSE, 0);
+
+  gtk_box_pack_start(GTK_BOX(window_vbox), titlebar_hbox, FALSE, FALSE, 0);
+
+#else
+  // Insert the tabstrip into the window.
   gtk_box_pack_start(GTK_BOX(window_vbox), titlebar_->widget(), FALSE, FALSE,
                      0);
+#endif  // OS_CHROMEOS
 
   // The content_vbox_ surrounds the "content": toolbar+bookmarks bar+page.
   content_vbox_ = gtk_vbox_new(FALSE, 0);
   gtk_widget_show(content_vbox_);
 
   toolbar_.reset(new BrowserToolbarGtk(browser_.get(), this));
   toolbar_->Init(browser_->profile(), window_);
   toolbar_->AddToolbarToBox(content_vbox_);
+#if defined(OS_CHROMEOS) && defined(COMPACT_NAV_BAR)
+  gtk_widget_hide(toolbar_->widget());
+#endif
 
   bookmark_bar_.reset(new BookmarkBarGtk(browser_->profile(), browser_.get(),
                                          this));
   bookmark_bar_->AddBookmarkbarToBox(content_vbox_);
 
   if (IsExtensionShelfSupported()) {
     extension_shelf_.reset(new ExtensionShelfGtk(browser()->profile(),
                                                  browser_.get()));
     extension_shelf_->AddShelfToBox(content_vbox_);
     MaybeShowExtensionShelf();
@@ skipping 49 matching lines @@
   UpdateCustomFrame();
 
   GtkWidget* event_box = gtk_event_box_new();
   gtk_container_add(GTK_CONTAINER(event_box), render_area_vbox_);
   gtk_widget_show(event_box);
   gtk_container_add(GTK_CONTAINER(content_vbox_), event_box);
   gtk_container_add(GTK_CONTAINER(window_vbox), content_vbox_);
   gtk_container_add(GTK_CONTAINER(window_), window_container_);
   gtk_widget_show(window_container_);
   browser_->tabstrip_model()->AddObserver(this);
+
+#if defined(OS_CHROMEOS) && defined(COMPACT_NAV_BAR)
+  // Create the compact navigation bar. This must be done after adding
+  // everything to the window since it's done in Views, which expects to call
+  // realize (requiring a window) in the Init function.
+  views::WidgetGtk* clb_widget =
+      new views::WidgetGtk(views::WidgetGtk::TYPE_CHILD);
+  clb_widget->set_delete_on_destroy(true);
+  // Must initialize with a NULL parent since the widget will assume the parent
+  // is also a WidgetGtk. Then we can parent the native widget afterwards.
+  clb_widget->Init(NULL, gfx::Rect(0, 0, 100, 30));
+  gtk_widget_reparent(clb_widget->GetNativeView(), navbar_hbox);
+
+  compact_navigation_bar_ = new CompactNavigationBar(browser_.get());
+
+  clb_widget->SetContentsView(compact_navigation_bar_);
+  compact_navigation_bar_->Init();
+
+  // Create the status area.
+  views::WidgetGtk* status_widget =
+      new views::WidgetGtk(views::WidgetGtk::TYPE_CHILD);
+  status_widget->set_delete_on_destroy(true);
+  status_widget->Init(NULL, gfx::Rect(0, 0, 100, 30));
+  gtk_widget_reparent(status_widget->GetNativeView(), status_hbox);
+  status_area_ = new StatusAreaView(browser());
+  status_widget->SetContentsView(status_area_);
+  status_area_->Init();
+
+  // Must be after Init.
+  gtk_widget_set_size_request(clb_widget->GetNativeView(),
+      compact_navigation_bar_->GetPreferredSize().width(), 20);
+  gfx::Size status_area_size = status_area_->GetPreferredSize();
+  gtk_widget_set_size_request(status_widget->GetNativeView(),
+                              status_area_size.width(),
+                              status_area_size.height());
+  clb_widget->Show();
+  status_widget->Show();
+#endif  // OS_CHROMEOS
 }
 
 void BrowserWindowGtk::SetBackgroundColor() {
   Profile* profile = browser()->profile();
   ThemeProvider* theme_provider = profile->GetThemeProvider();
   int frame_color_id;
   if (IsActive()) {
     frame_color_id = browser()->profile()->IsOffTheRecord()
         ? BrowserThemeProvider::COLOR_FRAME_INCOGNITO
         : BrowserThemeProvider::COLOR_FRAME;
@@ skipping 429 matching lines @@
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "Fluxbox" ||
           wm_name == "KWin" ||
           wm_name == "Metacity" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }