Merge 249331 "Tab close buttons can only be targeted with touch ..."

chrome/browser/ui/views/tabs/tab.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_
 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_
 
 #include <list>
 #include <string>
 
@@ skipping 115 matching lines @@
 
   // Returns the height for immersive mode tabs.
   static int GetImmersiveHeight();
 
  private:
   friend class TabTest;
   FRIEND_TEST_ALL_PREFIXES(TabTest, CloseButtonLayout);
 
   friend class TabStripTest;
   FRIEND_TEST_ALL_PREFIXES(TabStripTest, TabHitTestMaskWhenStacked);
+  FRIEND_TEST_ALL_PREFIXES(TabStripTest, ClippedTabCloseButton);
 
   // The animation object used to swap the favicon with the sad tab icon.
   class FaviconCrashAnimation;
   class TabCloseButton;
 
   // Contains a cached image and the values used to generate it.
   struct ImageCacheEntry {
     ImageCacheEntry();
     ~ImageCacheEntry();
 
@@ skipping 235 matching lines @@
   static int font_height_;
 
   // As the majority of the tabs are inactive, and painting tabs is slowish,
   // we cache a handful of the inactive tab backgrounds here.
   static ImageCache* image_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(Tab);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_