Support painting panels with chromium themes 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 29 matching lines @@
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
-#include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/x/active_window_watcher_x.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 using content::WebContents;
 
@@ skipping 547 matching lines @@
   }
   UpdateTitlebarAlignment();
   UpdateMaximizeRestoreVisibility();
 }
 
 void BrowserTitlebar::UpdateTitleAndIcon() {
   if (!app_mode_title_)
     return;
 
   // Get the page title and elide it to the available space.
-  std::string title;
-  BrowserWindowGtk::TitleDecoration title_decoration =
-      browser_window_->GetWindowTitle(&title);
-
-  if (title_decoration == BrowserWindowGtk::PANGO_MARKUP) {
-    gtk_label_set_markup(GTK_LABEL(app_mode_title_), title.c_str());
-  } else {
-    DCHECK_EQ(BrowserWindowGtk::PLAIN_TEXT, title_decoration);
-    gtk_label_set_text(GTK_LABEL(app_mode_title_), title.c_str());
-  }
+  string16 title = browser_window_->browser()->GetWindowTitleForCurrentTab();
+  gtk_label_set_text(GTK_LABEL(app_mode_title_), UTF16ToUTF8(title).c_str());
 
   if (browser_window_->browser()->is_app()) {
     switch (browser_window_->browser()->type()) {
       case Browser::TYPE_POPUP: {
         // Update the system app icon.  We don't need to update the icon in the
         // top left of the custom frame, that will get updated when the
         // throbber is updated.
         Profile* profile = browser_window_->browser()->profile();
         SkBitmap icon = browser_window_->browser()->GetCurrentPageIcon();
         if (icon.empty()) {
           gtk_util::SetWindowIcon(window_, profile);
         } else {
           GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(&icon);
           gtk_util::SetWindowIcon(window_, profile, icon_pixbuf);
           g_object_unref(icon_pixbuf);
         }
         break;
       }
       case Browser::TYPE_TABBED: {
         NOTREACHED() << "We should never have a tabbed app window.";
         break;
       }
       case Browser::TYPE_PANEL: {
         break;

[jennb, 2012/04/27 18:36:13]

NOTREACHED()

[jianli, 2012/04/27 20:22:34]

Done.

       }
     }
   }
 }
 
 void BrowserTitlebar::UpdateThrobber(WebContents* web_contents) {
   DCHECK(app_mode_favicon_);
 
   if (web_contents && web_contents->IsLoading()) {
     GdkPixbuf* icon_pixbuf =
@@ skipping 289 matching lines @@
 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()));
   }
 
   context_menu_->PopupAsContext(gfx::Point(event->x_root, event->y_root),
                                 event->time);
 }
 
-void BrowserTitlebar::SendEnterNotifyToCloseButtonIfUnderMouse() {
-  gint x;
-  gint y;
-  GtkAllocation widget_allocation = close_button_->WidgetAllocation();
-  gtk_widget_get_pointer(GTK_WIDGET(close_button_->widget()), &x, &y);
-
-  gfx::Rect button_rect(0, 0, widget_allocation.width,
-                        widget_allocation.height);
-  if (!button_rect.Contains(x, y)) {
-    // Mouse is not over the close button.
-    return;
-  }
-
-  // Create and emit an enter-notify-event on close button.
-  GValue return_value;
-  return_value.g_type = G_TYPE_BOOLEAN;
-  g_value_set_boolean(&return_value, false);
-
-  GdkEvent* event = gdk_event_new(GDK_ENTER_NOTIFY);
-  event->crossing.window =
-      gtk_button_get_event_window(GTK_BUTTON(close_button_->widget()));
-  event->crossing.send_event = FALSE;
-  event->crossing.subwindow = gtk_widget_get_window(close_button_->widget());
-  event->crossing.time = gtk_util::XTimeNow();
-  event->crossing.x = x;
-  event->crossing.y = y;
-  event->crossing.x_root = widget_allocation.x;
-  event->crossing.y_root = widget_allocation.y;
-  event->crossing.mode = GDK_CROSSING_NORMAL;
-  event->crossing.detail = GDK_NOTIFY_ANCESTOR;
-  event->crossing.focus = true;
-  event->crossing.state = 0;
-
-  g_signal_emit_by_name(GTK_OBJECT(close_button_->widget()),
-                        "enter-notify-event", event,
-                        &return_value);
-}
-
-int BrowserTitlebar::IconOnlyWidth() {
-  GtkAllocation allocation;
-  gtk_widget_get_allocation(app_mode_favicon_, &allocation);
-  return 2 * kFrameBorderThickness + allocation.width;
-}
-
 bool BrowserTitlebar::IsCommandIdEnabled(int command_id) const {
   if (command_id == kShowWindowDecorationsCommand)
     return true;
 
   return browser_window_->browser()->command_updater()->
       IsCommandEnabled(command_id);
 }
 
 bool BrowserTitlebar::IsCommandIdChecked(int command_id) const {
   if (command_id == kShowWindowDecorationsCommand) {
@@ skipping 146 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);
 }