Fix the misalignment on CrOS of the tab background images

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 196 matching lines @@
   void PaintTab(gfx::Canvas* canvas);
 
   // Paint with the "immersive mode" light-bar style.
   void PaintImmersiveTab(gfx::Canvas* canvas);
 
   // Paint various portions of the Tab
   void PaintTabBackground(gfx::Canvas* canvas);
   void PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas,
                                                  ui::MultiAnimation* animation);
   void PaintInactiveTabBackground(gfx::Canvas* canvas);
-  void PaintInactiveTabBackgroundUsingResourceId(gfx::Canvas* canvas,
-                                                 int tab_id);
+  void PaintInactiveTabBackgroundUsingResourceIds(gfx::Canvas* canvas,
+                                                  int background_id,
+                                                  int background_overlay_id);
   void PaintActiveTabBackground(gfx::Canvas* canvas);
 
   // Paints the icon at the specified coordinates, mirrored for RTL if needed.
   void PaintIcon(gfx::Canvas* canvas);
   void PaintCaptureState(gfx::Canvas* canvas, gfx::Rect bounds);
   void PaintTitle(gfx::Canvas* canvas, SkColor title_color);
 
   // Invoked if data_.network_state changes, or the network_state is not none.
   void AdvanceLoadingAnimation(TabRendererData::NetworkState old_state,
                                TabRendererData::NetworkState state);
@@ skipping 26 matching lines @@
 
   // Returns true if the crash animation is currently running.
   bool IsPerformingCrashAnimation() const;
 
   // Schedules repaint task for icon.
   void ScheduleIconPaint();
 
   // Returns the rectangle for the light bar in immersive mode.
   gfx::Rect GetImmersiveBarRect() const;
 
-  // Gets the tab id and frame id.
-  void GetTabIdAndFrameId(views::Widget* widget,
-                          int* tab_id,
-                          int* frame_id) const;
+  // Gets the resource ids of the theme images to use for painting the inactive
+  // tab background.
+  void GetInactiveBackgroundIdAndOverlayId(views::Widget* widget,
+                                           int* background_id,
+                                           int* background_overlay_id) const;
 
   // Performs a one-time initialization of static resources such as tab images.
   static void InitTabResources();
 
   // Returns the minimum possible size of a single unselected Tab, not
   // including considering touch mode.
   static gfx::Size GetBasicMinimumUnselectedSize();
 
   // Loads the images to be used for the tab background.
   static void LoadTabImages();
@@ skipping 86 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_