Nukes the nano tab style on gtk and brings back the toolbar for apps

chrome/browser/gtk/tabs/tab_renderer_gtk.cc

 // Copyright (c) 2010 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/tabs/tab_renderer_gtk.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "app/l10n_util.h"
@@ skipping 110 matching lines @@
     int loading, int waiting, int waiting_to_loading)
     : waiting_animation_frames(NULL),
       loading_animation_frames(NULL),
       loading_animation_frame_count(loading),
       waiting_animation_frame_count(waiting),
       waiting_to_loading_frame_count_ratio(waiting_to_loading) {
 }
 
 bool TabRendererGtk::initialized_ = false;
 TabRendererGtk::TabImage TabRendererGtk::tab_active_ = {0};
-TabRendererGtk::TabImage TabRendererGtk::tab_active_nano_ = {0};
 TabRendererGtk::TabImage TabRendererGtk::tab_inactive_ = {0};
-TabRendererGtk::TabImage TabRendererGtk::tab_inactive_nano_ = {0};
 TabRendererGtk::TabImage TabRendererGtk::tab_alpha_ = {0};
-TabRendererGtk::TabImage TabRendererGtk::tab_alpha_nano_ = {0};
 gfx::Font* TabRendererGtk::title_font_ = NULL;
 int TabRendererGtk::title_font_height_ = 0;
 int TabRendererGtk::close_button_width_ = 0;
 int TabRendererGtk::close_button_height_ = 0;
 SkColor TabRendererGtk::selected_title_color_ = SK_ColorBLACK;
 SkColor TabRendererGtk::unselected_title_color_ = SkColorSetRGB(64, 64, 64);
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabRendererGtk::LoadingAnimation, public:
 //
@@ skipping 238 matching lines @@
     theme_id = IDR_THEME_TOOLBAR;
   } else {
     if (!data_.off_the_record) {
       theme_id = IDR_THEME_TAB_BACKGROUND;
     } else {
       theme_id = IDR_THEME_TAB_BACKGROUND_INCOGNITO;
     }
     if (!theme_provider_->HasCustomImage(theme_id))
       offset_y = background_offset_y_;
   }
-
-  // If the tab is a nanotab, we must take care to only draw the background
-  // within the height of the nanotab.
-  int nanoTabOffset = data_.app ? 9 : 0;
   SkBitmap* tab_bg = theme_provider_->GetBitmapNamed(theme_id);
   canvas.TileImageInt(*tab_bg,
-                      x() + favicon_bounds_.x(),
-                      offset_y + favicon_bounds_.y() + nanoTabOffset,
-                      favicon_bounds_.x(),
-                      favicon_bounds_.y() + nanoTabOffset,
-                      favicon_bounds_.width(),
-                      favicon_bounds_.height() - nanoTabOffset);
+      x() + favicon_bounds_.x(), offset_y + favicon_bounds_.y(),
+      favicon_bounds_.x(), favicon_bounds_.y(),
+      favicon_bounds_.width(), favicon_bounds_.height());
 
   if (!IsSelected()) {
     double throb_value = GetThrobValue();
     if (throb_value > 0) {
       SkRect bounds;
       bounds.set(favicon_bounds_.x(), favicon_bounds_.y(),
           favicon_bounds_.right(), favicon_bounds_.bottom());
       canvas.saveLayerAlpha(&bounds, static_cast<int>(throb_value * 0xff),
                             SkCanvas::kARGB_ClipLayer_SaveFlag);
       canvas.drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
@@ skipping 49 matching lines @@
   return std::max(content_height, close_button_height_);
 }
 
 // static
 void TabRendererGtk::LoadTabImages() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   tab_alpha_.image_l = rb.GetBitmapNamed(IDR_TAB_ALPHA_LEFT);
   tab_alpha_.image_r = rb.GetBitmapNamed(IDR_TAB_ALPHA_RIGHT);
 
-  tab_alpha_nano_.image_l = rb.GetBitmapNamed(IDR_TAB_ALPHA_NANO_LEFT);
-  tab_alpha_nano_.image_r = rb.GetBitmapNamed(IDR_TAB_ALPHA_NANO_RIGHT);
-
   tab_active_.image_l = rb.GetBitmapNamed(IDR_TAB_ACTIVE_LEFT);
   tab_active_.image_c = rb.GetBitmapNamed(IDR_TAB_ACTIVE_CENTER);
   tab_active_.image_r = rb.GetBitmapNamed(IDR_TAB_ACTIVE_RIGHT);
   tab_active_.l_width = tab_active_.image_l->width();
   tab_active_.r_width = tab_active_.image_r->width();
 
-  const int kNanoTabDiffHeight = 13;
-
-  tab_active_nano_.image_l = rb.GetBitmapNamed(IDR_TAB_ACTIVE_NANO_LEFT);
-  tab_active_nano_.image_c = rb.GetBitmapNamed(IDR_TAB_ACTIVE_NANO_CENTER);
-  tab_active_nano_.image_r = rb.GetBitmapNamed(IDR_TAB_ACTIVE_NANO_RIGHT);
-  tab_active_nano_.l_width = tab_active_nano_.image_l->width();
-  tab_active_nano_.r_width = tab_active_nano_.image_r->width();
-  tab_active_nano_.y_offset = kNanoTabDiffHeight;
-
   tab_inactive_.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT);
   tab_inactive_.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER);
   tab_inactive_.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT);
   tab_inactive_.l_width = tab_inactive_.image_l->width();
   tab_inactive_.r_width = tab_inactive_.image_r->width();
 
-  tab_inactive_nano_.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_NANO_LEFT);
-  tab_inactive_nano_.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_NANO_CENTER);
-  tab_inactive_nano_.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_NANO_RIGHT);
-  tab_inactive_nano_.l_width = tab_inactive_.image_l->width();
-  tab_inactive_nano_.r_width = tab_inactive_.image_r->width();
-  tab_inactive_nano_.y_offset = kNanoTabDiffHeight;
-
   close_button_width_ = rb.GetBitmapNamed(IDR_TAB_CLOSE)->width();
   close_button_height_ = rb.GetBitmapNamed(IDR_TAB_CLOSE)->height();
 }
 
 // static
 void TabRendererGtk::SetSelectedTitleColor(SkColor color) {
   selected_title_color_ = color;
 }
 
 // static
@@ skipping 392 matching lines @@
 
   // The tab image needs to be lined up with the background image
   // so that it feels partially transparent.
   int offset_x = background_offset_x_;
 
   int tab_id = is_otr ?
       IDR_THEME_TAB_BACKGROUND_INCOGNITO : IDR_THEME_TAB_BACKGROUND;
 
   SkBitmap* tab_bg = theme_provider_->GetBitmapNamed(tab_id);
 
-  // App tabs are drawn slightly differently (as nano tabs).
-  TabImage* tab_image = data_.app ? &tab_active_nano_ : &tab_active_;
-  TabImage* tab_inactive_image = data_.app ? &tab_inactive_nano_ :
-                                             &tab_inactive_;
-  TabImage* alpha = data_.app ? &tab_alpha_nano_ : &tab_alpha_;
-
   // If the theme is providing a custom background image, then its top edge
   // should be at the top of the tab. Otherwise, we assume that the background
   // image is a composited foreground + frame image.
   int offset_y = theme_provider_->HasCustomImage(tab_id) ?
       0 : background_offset_y_;
 
   // Draw left edge.
-  SkBitmap* theme_l = GetMaskedBitmap(alpha->image_l, tab_bg, offset_x,
+  SkBitmap* theme_l = GetMaskedBitmap(tab_alpha_.image_l, tab_bg, offset_x,
                                       offset_y);
   canvas->DrawBitmapInt(*theme_l, 0, 0);
 
   // Draw right edge.
-  SkBitmap* theme_r = GetMaskedBitmap(alpha->image_r, tab_bg,
-      offset_x + width() - tab_image->r_width, offset_y);
+  SkBitmap* theme_r = GetMaskedBitmap(tab_alpha_.image_r, tab_bg,
+      offset_x + width() - tab_active_.r_width, offset_y);
 
   canvas->DrawBitmapInt(*theme_r, width() - theme_r->width(), 0);
 
   // Draw center.
-  canvas->TileImageInt(
-      *tab_bg,
-      offset_x + tab_image->l_width,
-      kDropShadowOffset + offset_y + tab_image->y_offset,
-      tab_image->l_width,
-      kDropShadowHeight + tab_image->y_offset,
-      width() - tab_image->l_width - tab_image->r_width,
-      height() - kDropShadowHeight - tab_image->y_offset);
+  canvas->TileImageInt(*tab_bg,
+      offset_x + tab_active_.l_width, kDropShadowOffset + offset_y,
+      tab_active_.l_width, 2,
+      width() - tab_active_.l_width - tab_active_.r_width, height() - 2);
 
-  canvas->DrawBitmapInt(*tab_inactive_image->image_l, 0, 0);
-  canvas->TileImageInt(
-      *tab_inactive_image->image_c,
-      tab_inactive_image->l_width,
-      0,
-      width() - tab_inactive_image->l_width - tab_inactive_image->r_width,
-      height());
-  canvas->DrawBitmapInt(*tab_inactive_image->image_r,
-      width() - tab_inactive_image->r_width, 0);
+  canvas->DrawBitmapInt(*tab_inactive_.image_l, 0, 0);
+  canvas->TileImageInt(*tab_inactive_.image_c, tab_inactive_.l_width, 0,
+      width() - tab_inactive_.l_width - tab_inactive_.r_width, height());
+  canvas->DrawBitmapInt(*tab_inactive_.image_r,
+      width() - tab_inactive_.r_width, 0);
 }
 
 void TabRendererGtk::PaintActiveTabBackground(gfx::Canvas* canvas) {
   int offset_x = background_offset_x_;
 
   SkBitmap* tab_bg = theme_provider_->GetBitmapNamed(IDR_THEME_TOOLBAR);
 
-  // App tabs are drawn slightly differently (as nano tabs).
-  TabImage* tab_image = data_.app ? &tab_active_nano_ : &tab_active_;
-  TabImage* alpha = data_.app ? &tab_alpha_nano_ : &tab_alpha_;
-
   // Draw left edge.
-  SkBitmap* theme_l = GetMaskedBitmap(alpha->image_l, tab_bg, offset_x, 0);
+  SkBitmap* theme_l = GetMaskedBitmap(tab_alpha_.image_l, tab_bg, offset_x, 0);
   canvas->DrawBitmapInt(*theme_l, 0, 0);
 
   // Draw right edge.
-  SkBitmap* theme_r = GetMaskedBitmap(alpha->image_r, tab_bg,
-      offset_x + width() - tab_image->r_width, 0);
-  canvas->DrawBitmapInt(*theme_r, width() - tab_image->r_width, 0);
+  SkBitmap* theme_r = GetMaskedBitmap(tab_alpha_.image_r, tab_bg,
+      offset_x + width() - tab_active_.r_width, 0);
+  canvas->DrawBitmapInt(*theme_r, width() - tab_active_.r_width, 0);
 
   // Draw center.
   canvas->TileImageInt(*tab_bg,
-                       offset_x + tab_image->l_width,
-                       kDropShadowHeight + tab_image->y_offset,
-                       tab_image->l_width,
-                       kDropShadowHeight + tab_image->y_offset,
-                       width() - tab_image->l_width - tab_image->r_width,
-                       height() - kDropShadowHeight - tab_image->y_offset);
+      offset_x + tab_active_.l_width, kDropShadowHeight,
+      tab_active_.l_width, kDropShadowHeight,
+      width() - tab_active_.l_width - tab_active_.r_width,
+      height() - kDropShadowHeight);
 
-  canvas->DrawBitmapInt(*tab_image->image_l, 0, 0);
-  canvas->TileImageInt(*tab_image->image_c, tab_image->l_width, 0,
-      width() - tab_image->l_width - tab_image->r_width, height());
-  canvas->DrawBitmapInt(*tab_image->image_r, width() - tab_image->r_width, 0);
+  canvas->DrawBitmapInt(*tab_active_.image_l, 0, 0);
+  canvas->TileImageInt(*tab_active_.image_c, tab_active_.l_width, 0,
+      width() - tab_active_.l_width - tab_active_.r_width, height());
+  canvas->DrawBitmapInt(*tab_active_.image_r, width() - tab_active_.r_width, 0);
 }
 
 void TabRendererGtk::PaintLoadingAnimation(gfx::Canvas* canvas) {
   const SkBitmap* frames =
       (loading_animation_.animation_state() == ANIMATION_WAITING) ?
       loading_animation_.waiting_animation_frames() :
       loading_animation_.loading_animation_frames();
   const int image_size = frames->height();
   const int image_offset = loading_animation_.animation_frame() * image_size;
   DCHECK(image_size == favicon_bounds_.height());
@@ skipping 123 matching lines @@
   // Force the font size to 9pt, which matches Windows' default font size
   // (taken from the system).
   const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
   title_font_ = new gfx::Font(gfx::Font::CreateFont(base_font.FontName(), 9));
   title_font_height_ = title_font_->height();
 
   crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
 
   initialized_ = true;
 }