Correctly align tab and toolbar backgrounds with the frame background.

chrome/browser/ui/views/frame/glass_browser_frame_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 347 matching lines @@
   // the tabstrip is on the top.
   gfx::ImageSkia* theme_toolbar = tp->GetImageSkiaNamed(IDR_THEME_TOOLBAR);
   int dest_y = y;
   // In the pre-MD world, the toolbar top edge is drawn using the
   // IDR_CONTENT_TOP_XXX images, which overlay the toolbar.  The top 2 px of
   // these images is the actual top edge, and is partly transparent, so the
   // toolbar background shouldn't be drawn over it.
   const int kPreMDToolbarTopEdgeExclusion = 2;
   if (browser_view()->IsTabStripVisible())
     dest_y += kPreMDToolbarTopEdgeExclusion;
-  canvas->TileImageInt(*theme_toolbar, x + GetThemeBackgroundXInset(),
-                       dest_y - GetTopInset(), x, dest_y, w,
-                       theme_toolbar->height());
+  canvas->TileImageInt(
+      *theme_toolbar, x + GetThemeBackgroundXInset(),
+      dest_y - GetTopInset() + Tab::GetYOffsetForActiveTabBackground(),
+      x, dest_y, w, theme_toolbar->height());
 
   // Toolbar edges.
   if (browser_view()->IsTabStripVisible()) {
     // Pre-Windows 10, we draw toolbar left and right edges and top corners,
     // partly atop the window border.  In Windows 10+, we don't draw our own
     // window border but rather go right to the system border, so we need only
     // draw the toolbar top edge.
     int center_x = x;
     int center_w = w;
     if (base::win::GetVersion() < base::win::VERSION_WIN10) {
@@ skipping 252 matching lines @@
   static bool initialized = false;
   if (!initialized) {
     for (int i = 0; i < kThrobberIconCount; ++i) {
       throbber_icons_[i] =
           ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i);
       DCHECK(throbber_icons_[i]);
     }
     initialized = true;
   }
 }