Two changes to extension app icons:...

chrome/browser/views/tabs/tab_strip.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H_
 #define CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H_
 
+#include <vector>
+
 #include "app/animation_container.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/timer.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/views/tabs/base_tab_strip.h"
 #include "chrome/browser/views/tabs/tab.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"
 #include "views/animation/bounds_animator.h"
@@ skipping 151 matching lines @@
   virtual void WillProcessMessage(const MSG& msg);
   virtual void DidProcessMessage(const MSG& msg);
 #else
   virtual void WillProcessEvent(GdkEvent* event);
   virtual void DidProcessEvent(GdkEvent* event);
 #endif
 
   // Horizontal gap between mini and non-mini-tabs.
   static const int mini_to_non_mini_gap_;
 
+  // Extra horizontal gap (on top of mini_to_non_mini_gap_) when one of the
+  // mini tabs is a nano tab.
+  static const int extra_gap_for_nano_;
+
  private:
   class RemoveTabDelegate;
 
   friend class DraggedTabController;
 
   // AnimationType used for tracking animations that require additional
   // state beyond just animating the bounds of a view.
   //
   // Currently the only animation special cased is that of inserting the new tab
   // page at the end of the tab strip. Here's the steps that take place when
@@ skipping 74 matching lines @@
 
   // Gets the number of Tabs in the collection.
   // WARNING: this is the number of tabs displayed by the tabstrip, which if
   // an animation is ongoing is not necessarily the same as the number of tabs
   // in the model.
   int GetTabCount() const;
 
   // Returns the number of mini-tabs.
   int GetMiniTabCount() const;
 
+  // Returns the number of nano-tabs.
+  int GetNanoTabCount() const;
+
   // -- Tab Resize Layout -----------------------------------------------------
 
   // Returns the exact (unrounded) current width of each tab.
   void GetCurrentTabWidths(double* unselected_width,
                            double* selected_width) const;
 
   // Returns the exact (unrounded) desired width of each tab, based on the
   // desired strip width and number of tabs.  If
   // |width_of_tabs_for_mouse_close_| is nonnegative we use that value in
   // calculating the desired strip width; otherwise we use the current width.
-  // |mini_tab_count| gives the number of mini-tabs, and |tab_count| the
-  // number of mini and non-mini-tabs.
+  // |mini_tab_count| gives the number of mini-tabs, |nano_tab_count| the
+  // number of mini-tabs and |tab_count| the number of mini and non-mini-tabs.
   void GetDesiredTabWidths(int tab_count,
                            int mini_tab_count,
+                           int nano_tab_count,
                            double* unselected_width,
                            double* selected_width) const;
 
   // Perform an animated resize-relayout of the TabStrip immediately.
   void ResizeLayoutTabs();
 
   // Returns whether or not the cursor is currently in the "tab strip zone"
   // which is defined as the region above the TabStrip and a bit below it.
   bool IsCursorInTabStripZone() const;
 
@@ skipping 158 matching lines @@
   // Used for stage 1 of new tab animation.
   base::OneShotTimer<TabStrip> new_tab_timer_;
 
   // Set for special animations.
   AnimationType animation_type_;
 
   DISALLOW_COPY_AND_ASSIGN(TabStrip);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H_