GTK: Add download notifications to the unity dock.

chrome/browser/ui/gtk/browser_titlebar.cc

 // Copyright (c) 2011 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 11 matching lines @@
 #include "chrome/browser/ui/gtk/accelerators_gtk.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #if defined(USE_GCONF)
 #include "chrome/browser/ui/gtk/gconf_titlebar_listener.h"
 #endif
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "chrome/browser/ui/gtk/nine_box.h"
+#include "chrome/browser/ui/gtk/unity_service.h"

[Evan Martin, 2011/04/26 21:33:04]

u comes after t

 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
@@ skipping 474 matching lines @@
                    G_CALLBACK(OnMouseMoveEvent), browser_window_);
   std::string localized_tooltip = l10n_util::GetStringUTF8(tooltip);
   gtk_widget_set_tooltip_text(button->widget(),
                               localized_tooltip.c_str());
   gtk_box_pack_start(GTK_BOX(box), button->widget(), FALSE, FALSE, 0);
   return button;
 }
 
 void BrowserTitlebar::UpdateCustomFrame(bool use_custom_frame) {
   using_custom_frame_ = use_custom_frame;
-  if (use_custom_frame) {
+  if (!use_custom_frame ||
+      (browser_window_->IsMaximized() && unity::IsRunning())) {
+    if (titlebar_left_buttons_vbox_)
+      gtk_widget_hide(titlebar_left_buttons_vbox_);
+    if (titlebar_right_buttons_vbox_)
+      gtk_widget_hide(titlebar_right_buttons_vbox_);
+  } else {
     if (titlebar_left_buttons_vbox_)
       gtk_widget_show_all(titlebar_left_buttons_vbox_);
     if (titlebar_right_buttons_vbox_)
       gtk_widget_show_all(titlebar_right_buttons_vbox_);
-  } else {
-    if (titlebar_left_buttons_vbox_)
-      gtk_widget_hide(titlebar_left_buttons_vbox_);
-    if (titlebar_right_buttons_vbox_)
-      gtk_widget_hide(titlebar_right_buttons_vbox_);
   }
   UpdateTitlebarAlignment();
   UpdateMaximizeRestoreVisibility();
 }
 
 void BrowserTitlebar::UpdateTitleAndIcon() {
   if (!app_mode_title_)
     return;
 
   // Get the page title and elide it to the available space.
@@ skipping 54 matching lines @@
   if (browser_window_->browser()->type() == Browser::TYPE_NORMAL) {
     int top_padding = 0;
     int side_padding = 0;
     int vertical_offset = kNormalVerticalOffset;
 
     if (using_custom_frame_) {
       if (!browser_window_->IsMaximized()) {
         top_padding = kTitlebarHeight;
       } else if (using_custom_frame_ && browser_window_->IsMaximized()) {
         vertical_offset = 0;
-        side_padding = kMaximizedTabstripPadding;
+        if (!unity::IsRunning())
+          side_padding = kMaximizedTabstripPadding;
       }
     }
 
     int right_padding = 0;
     int left_padding = kTabStripLeftPadding;
     if (titlebar_right_buttons_hbox_)
       right_padding = side_padding;
     if (titlebar_left_buttons_hbox_)
       left_padding = side_padding;
 
@@ skipping 321 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);
 }