[Win] Redesign the new avatar button.

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 "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 94 matching lines @@
 
 gfx::Rect GlassBrowserFrameView::GetBoundsForTabStrip(
     views::View* tabstrip) const {
   int minimize_button_offset =
       std::min(frame()->GetMinimizeButtonOffset(), width());
 
   // The new avatar button is optionally displayed to the left of the
   // minimize button.
   if (new_avatar_button()) {
     DCHECK(switches::IsNewAvatarMenu());
-    minimize_button_offset -= new_avatar_button()->width();
+    minimize_button_offset -=
+        new_avatar_button()->width() + kNewAvatarButtonOffset;
+
+    // In non-maximized mode, allow the new tab button to completely slide under
+    // the avatar button.
+    if (!frame()->IsMaximized() && !base::i18n::IsRTL()) {
+      minimize_button_offset +=
+          TabStrip::kNewTabButtonAssetWidth + kNewTabCaptionRestoredSpacing;
+    }
   }
 
   int tabstrip_x = browser_view()->ShouldShowAvatar() ?
       (avatar_bounds_.right() + kAvatarRightSpacing) :
       NonClientBorderThickness() + kTabStripIndent;
   // In RTL languages, we have moved an avatar icon left by the size of window
   // controls to prevent it from being rendered over them. So, we use its x
   // position to move this tab strip left when maximized. Also, we can render
   // a tab strip until the left end of this window without considering the size
   // of window controls in RTL languages.
@@ skipping 461 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;
   }
 }