Improve large tab strip by leveraging touch icons when present

chrome/browser/ui/touch/tabs/touch_tab.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TOUCH_TABS_TOUCH_TAB_H_
 #define CHROME_BROWSER_UI_TOUCH_TABS_TOUCH_TAB_H_
 #pragma once
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/views/tabs/base_tab.h"
 #include "ui/gfx/point.h"
 
+// The size of the favicon touch area.
+const int kTouchTargetIconSize = 32;

[sky, 2011/06/17 15:34:55]

Make this is a static field of TouchTab, just like TouchTab::kViewClassName.

[Emmanuel Saint-loubert-Bié, 2011/06/17 16:11:23]

Done.

+
 ///////////////////////////////////////////////////////////////////////////////
 //
 // TouchTab
 //
 //  A View that renders a TouchTab in a TouchTabStrip
 //
 // TODO(wyck): Use transformable views for scrolling.
 ///////////////////////////////////////////////////////////////////////////////
 class TouchTab : public BaseTab {
  public:
   // The menu button's class name.
   static const char kViewClassName[];
 
   explicit TouchTab(TabController* controller);
   virtual ~TouchTab();
 
   // Set the background offset used to match the image in the inactive tab
   // to the frame image.
   void set_background_offset(const gfx::Point& offset) {
     background_offset_ = offset;
   }
 
+  // get and set touch icon
+  void set_touch_icon(const SkBitmap& bitmap) {
+    touch_icon_ = bitmap;
+  }
+  const SkBitmap& touch_icon() const {
+    return touch_icon_;
+  }
+
   // Returns the minimum possible size of a single unselected Tab.
   static gfx::Size GetMinimumUnselectedSize();
 
  protected:
   virtual const gfx::Rect& GetTitleBounds() const;
   virtual const gfx::Rect& GetIconBounds() const;
 
  private:
   // Overridden from views::View:
   virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
@@ skipping 20 matching lines @@
 
   // the bounds of the title text
   gfx::Rect title_bounds_;
 
   // the bounds of the favicon
   gfx::Rect favicon_bounds_;
 
   // The offset used to paint the inactive background image.
   gfx::Point background_offset_;
 
+  // The touch icon found
+  SkBitmap touch_icon_;
+
   // 'l' is for left
   // 'c' is for center
   // 'r' is for right
   struct TouchTabImage {
     SkBitmap* image_l;
     SkBitmap* image_c;
     SkBitmap* image_r;
     int l_width;
     int r_width;
     int y_offset;
   };
   static TouchTabImage tab_active;
   static TouchTabImage tab_inactive;
   static TouchTabImage tab_alpha;
 
   DISALLOW_COPY_AND_ASSIGN(TouchTab);
 };
 
 #endif  // CHROME_BROWSER_UI_TOUCH_TABS_TOUCH_TAB_H_