Add PanelBrowserTitlebarGtk for panels on GTK.

chrome/browser/ui/gtk/browser_titlebar.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 "chrome/browser/ui/gtk/browser_titlebar.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 416 matching lines @@
   StringTokenizer tokenizer(button_string, ":,");
   tokenizer.set_options(StringTokenizer::RETURN_DELIMS);
   int left_count = 0;
   int right_count = 0;
   while (tokenizer.GetNext()) {
     if (tokenizer.token_is_delim()) {
       if (*tokenizer.token_begin() == ':')
         left_side = false;
     } else {
       base::StringPiece token = tokenizer.token_piece();
-      if (token == "minimize" && !IsTypePanel()) {
+      if (BuildButton(token.as_string(), left_side))
         (left_side ? left_count : right_count)++;
-        GtkWidget* parent_box = GetButtonHBox(left_side);
-        minimize_button_.reset(
-            BuildTitlebarButton(IDR_MINIMIZE, IDR_MINIMIZE_P,
-                                IDR_MINIMIZE_H, parent_box, true,
-                                IDS_XPFRAME_MINIMIZE_TOOLTIP));
-
-        gtk_widget_size_request(minimize_button_->widget(),
-                                &minimize_button_req_);
-      } else if (token == "maximize" && !IsTypePanel()) {
-        (left_side ? left_count : right_count)++;
-        GtkWidget* parent_box = GetButtonHBox(left_side);
-        restore_button_.reset(
-            BuildTitlebarButton(IDR_RESTORE, IDR_RESTORE_P,
-                                IDR_RESTORE_H, parent_box, true,
-                                IDS_XPFRAME_RESTORE_TOOLTIP));
-        maximize_button_.reset(
-            BuildTitlebarButton(IDR_MAXIMIZE, IDR_MAXIMIZE_P,
-                                IDR_MAXIMIZE_H, parent_box, true,
-                                IDS_XPFRAME_MAXIMIZE_TOOLTIP));
-
-        gtk_util::SetButtonClickableByMouseButtons(maximize_button_->widget(),
-                                                   true, true, true);
-        gtk_widget_size_request(restore_button_->widget(),
-                                &restore_button_req_);
-      } else if (token == "close") {
-        (left_side ? left_count : right_count)++;
-        GtkWidget* parent_box = GetButtonHBox(left_side);
-        close_button_.reset(
-            BuildTitlebarButton(IDR_CLOSE, IDR_CLOSE_P,
-                                IDR_CLOSE_H, parent_box, true,
-                                IDS_XPFRAME_CLOSE_TOOLTIP));
-        close_button_->set_flipped(left_side);
-
-        gtk_widget_size_request(close_button_->widget(), &close_button_req_);
-      }
-      // Ignore any other values like "pin" since we don't have images for
-      // those.
     }
   }
 
   // If we are in incognito mode, add the spy guy to either the end of the left
   // or the beginning of the right depending on which side has fewer buttons.
   display_avatar_on_left_ = right_count > left_count;
 
   // Now show the correct widgets in the two hierarchies.
   if (using_custom_frame_) {
     gtk_widget_show_all(titlebar_left_buttons_vbox_);
     gtk_widget_show_all(titlebar_right_buttons_vbox_);
   }
   UpdateMaximizeRestoreVisibility();
 }
 
+bool BrowserTitlebar::BuildButton(const std::string& button_token,
+                                  bool left_side) {
+  if (button_token == "minimize") {
+    GtkWidget* parent_box = GetButtonHBox(left_side);
+    minimize_button_.reset(
+        CreateTitlebarButton(IDR_MINIMIZE, IDR_MINIMIZE_P,
+                             IDR_MINIMIZE_H, parent_box,
+                             IDS_XPFRAME_MINIMIZE_TOOLTIP));
+
+    gtk_widget_size_request(minimize_button_->widget(),
+                            &minimize_button_req_);
+    return true;
+  } else if (button_token == "maximize") {

[jennb, 2012/04/20 22:26:32]

Should we add a "restore" token and separate the building of maximize_button_
and restore_button_ now as we already know that panel needs a restore button but
not a maximize button?

[jianli, 2012/04/20 23:00:29]

We can't do that because the passing string to BuildButtons do not have restore.

[jennb, 2012/04/21 01:04:49]

You could modify the passed in string, kDefaultButtonString.

Also, do we care about the GConf case? BuildButtons is conditional on !gconf...

+    GtkWidget* parent_box = GetButtonHBox(left_side);
+    restore_button_.reset(
+        CreateTitlebarButton(IDR_RESTORE, IDR_RESTORE_P,
+                             IDR_RESTORE_H, parent_box,
+                             IDS_XPFRAME_RESTORE_TOOLTIP));
+    maximize_button_.reset(
+        CreateTitlebarButton(IDR_MAXIMIZE, IDR_MAXIMIZE_P,
+                             IDR_MAXIMIZE_H, parent_box,
+                             IDS_XPFRAME_MAXIMIZE_TOOLTIP));
+
+    gtk_util::SetButtonClickableByMouseButtons(maximize_button_->widget(),
+                                               true, true, true);
+    gtk_widget_size_request(restore_button_->widget(),
+                            &restore_button_req_);
+    return true;
+  } else if (button_token == "close") {
+    GtkWidget* parent_box = GetButtonHBox(left_side);
+    close_button_.reset(
+        CreateTitlebarButton(IDR_CLOSE, IDR_CLOSE_P,
+                             IDR_CLOSE_H, parent_box,
+                             IDS_XPFRAME_CLOSE_TOOLTIP));
+    close_button_->set_flipped(left_side);
+
+    gtk_widget_size_request(close_button_->widget(), &close_button_req_);
+    return true;
+  }
+  // Ignore any other values like "pin" since we don't have images for
+  // those.
+  return false;
+}
+
 GtkWidget* BrowserTitlebar::GetButtonHBox(bool left_side) {
   if (left_side && titlebar_left_buttons_hbox_)
     return titlebar_left_buttons_hbox_;
   else if (!left_side && titlebar_right_buttons_hbox_)
     return titlebar_right_buttons_hbox_;
 
   // We put the min/max/restore/close buttons in a vbox so they are top aligned
   // (up to padding) and don't vertically stretch.
   GtkWidget* vbox = left_side ? titlebar_left_buttons_vbox_ :
                     titlebar_right_buttons_vbox_;
 
   GtkWidget* top_padding = gtk_fixed_new();
   gtk_widget_set_size_request(top_padding, -1, kButtonOuterPadding);
   gtk_box_pack_start(GTK_BOX(vbox), top_padding, FALSE, FALSE, 0);
 
   GtkWidget* buttons_hbox = gtk_hbox_new(FALSE, kButtonSpacing);
   gtk_box_pack_start(GTK_BOX(vbox), buttons_hbox, FALSE, FALSE, 0);
 
   if (left_side) {
     titlebar_left_buttons_hbox_ = buttons_hbox;
     top_padding_left_ = top_padding;
   } else {
     titlebar_right_buttons_hbox_ = buttons_hbox;
     top_padding_right_ = top_padding;
   }
 
   return buttons_hbox;
 }
 
-CustomDrawButton* BrowserTitlebar::BuildTitlebarButton(int image,
-    int image_pressed, int image_hot, GtkWidget* box, bool start,
-    int tooltip) {
+CustomDrawButton* BrowserTitlebar::CreateTitlebarButton(int image,
+    int image_pressed, int image_hot, GtkWidget* box, int tooltip) {
   CustomDrawButton* button = new CustomDrawButton(image, image_pressed,
                                                   image_hot, 0);
   gtk_widget_add_events(GTK_WIDGET(button->widget()), GDK_POINTER_MOTION_MASK);
   g_signal_connect(button->widget(), "clicked",
                    G_CALLBACK(OnButtonClickedThunk), this);
   g_signal_connect(button->widget(), "motion-notify-event",
                    G_CALLBACK(OnMouseMoveEvent), browser_window_);
   std::string localized_tooltip = l10n_util::GetStringUTF8(tooltip);
   gtk_widget_set_tooltip_text(button->widget(),
                               localized_tooltip.c_str());
-  if (start)
-    gtk_box_pack_start(GTK_BOX(box), button->widget(), FALSE, FALSE, 0);
-  else
-    gtk_box_pack_end(GTK_BOX(box), button->widget(), FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(box), button->widget(), FALSE, FALSE, 0);
   return button;
 }
 
 void BrowserTitlebar::UpdateButtonBackground(CustomDrawButton* button) {
   SkColor color = theme_service_->GetColor(
       ThemeService::COLOR_BUTTON_BACKGROUND);
   SkBitmap* background =
       theme_service_->GetBitmapNamed(IDR_THEME_WINDOW_CONTROL_BACKGROUND);
 
   // TODO(erg): For now, we just use a completely black mask and we can get
@@ skipping 75 matching lines @@
 void BrowserTitlebar::UpdateThrobber(WebContents* web_contents) {
   DCHECK(app_mode_favicon_);
 
   if (web_contents && web_contents->IsLoading()) {
     GdkPixbuf* icon_pixbuf =
         throbber_.GetNextFrame(web_contents->IsWaitingForResponse());
     gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_), icon_pixbuf);
   } else {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
-    // Note: we want to exclude the application popup window.
+    // Note: we want to exclude the application popup/panel window.
     if ((browser_window_->browser()->is_app() &&
-        browser_window_->browser()->is_type_popup()) ||
-        IsTypePanel()) {
+        !browser_window_->browser()->is_type_tabbed())) {
       SkBitmap icon = browser_window_->browser()->GetCurrentPageIcon();
       if (icon.empty()) {
         // Fallback to the Chromium icon if the page has no icon.
         gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_),
             rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_16).ToGdkPixbuf());
       } else {
         GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(&icon);
         gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_), icon_pixbuf);
         g_object_unref(icon_pixbuf);
       }
@@ skipping 251 matching lines @@
     browser_window_->UnMaximize();
   } else if (maximize_button_.get() && maximize_button_->widget() == button) {
     MaximizeButtonClicked();
   } else if (minimize_button_.get() && minimize_button_->widget() == button) {
     gtk_window_iconify(window_);
   }
 }
 
 gboolean BrowserTitlebar::OnFaviconMenuButtonPressed(GtkWidget* widget,
                                                      GdkEventButton* event) {
-  if (event->button != 1 || IsTypePanel())
+  if (event->button != 1)
     return FALSE;
 
   ShowFaviconMenu(event);
   return TRUE;
 }
 
 void BrowserTitlebar::ShowContextMenu(GdkEventButton* event) {
   if (!context_menu_.get()) {
     context_menu_model_.reset(new ContextMenuModel(this));
     context_menu_.reset(new MenuGtk(NULL, context_menu_model_.get()));
@@ skipping 130 matching lines @@
   // Can be called during shutdown; BrowserWindowGtk will set our |window_|
   // to NULL during that time.
   if (!window_)
     return;
 
   window_has_focus_ =
       gtk_widget_get_window(GTK_WIDGET(window_)) == active_window;
   UpdateTextColor();
 }
 
-bool BrowserTitlebar::IsTypePanel() {
-  return browser_window_->browser()->is_type_panel();
-}
-
 bool BrowserTitlebar::ShouldDisplayAvatar() {
   return (IsOffTheRecord() || HasMultipleProfiles()) &&
       browser_window_->browser()->is_type_tabbed();
 }
 
 bool BrowserTitlebar::IsOffTheRecord() {
   return browser_window_->browser()->profile()->IsOffTheRecord();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 56 matching lines @@
     ui::SimpleMenuModel::Delegate* delegate)
     : SimpleMenuModel(delegate) {
   AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
   AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
   AddSeparator();
   AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   AddSeparator();
   AddCheckItemWithStringId(kShowWindowDecorationsCommand,
                            IDS_SHOW_WINDOW_DECORATIONS_MENU);
 }