Remove references to IsNewAvatarMenu since the flag was removed.

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 96 matching lines @@
 // GlassBrowserFrameView, BrowserNonClientFrameView implementation:
 
 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() + 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.
   if (base::i18n::IsRTL()) {
     if (!browser_view()->ShouldShowAvatar() && frame()->IsMaximized()) {
       tabstrip_x += avatar_bounds_.x();
-    } else if (browser_view()->IsRegularOrGuestSession() &&
-               switches::IsNewAvatarMenu()) {
+    } else if (browser_view()->IsRegularOrGuestSession()) {
       tabstrip_x = width() - minimize_button_offset;
     }
 
     minimize_button_offset = width();
   }
   int tabstrip_width = minimize_button_offset - tabstrip_x -
       (frame()->IsMaximized() ?
           kNewTabCaptionMaximizedSpacing : kNewTabCaptionRestoredSpacing);
   return gfx::Rect(tabstrip_x, NonClientTopBorderHeight(),
                    std::max(0, tabstrip_width),
@@ skipping 115 matching lines @@
 
 void GlassBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
   if (browser_view()->IsToolbarVisible() &&
       browser_view()->toolbar()->ShouldPaintBackground())
     PaintToolbarBackground(canvas);
   if (!frame()->IsMaximized())
     PaintRestoredClientEdge(canvas);
 }
 
 void GlassBrowserFrameView::Layout() {
-  if (browser_view()->IsRegularOrGuestSession() && switches::IsNewAvatarMenu())
+  if (browser_view()->IsRegularOrGuestSession())
     LayoutNewStyleAvatar();
   else
     LayoutAvatar();
 
   LayoutClientView();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // GlassBrowserFrameView, protected:
 
@@ skipping 192 matching lines @@
   canvas->FillRect(gfx::Rect(client_area_bounds.x(), client_area_bottom,
                              client_area_bounds.width(), kClientEdgeThickness),
                    toolbar_color);
   canvas->FillRect(gfx::Rect(client_area_bounds.right(), client_area_top,
        kClientEdgeThickness,
        client_area_bottom + kClientEdgeThickness - client_area_top),
        toolbar_color);
 }
 
 void GlassBrowserFrameView::LayoutNewStyleAvatar() {
-  DCHECK(switches::IsNewAvatarMenu());
+  DCHECK(browser_view()->IsRegularOrGuestSession());
   if (!new_avatar_button())
     return;
 
   gfx::Size label_size = new_avatar_button()->GetPreferredSize();
 
   int button_x = frame()->GetMinimizeButtonOffset() -
       kNewAvatarButtonOffset - label_size.width();
   if (base::i18n::IsRTL())
     button_x = width() - frame()->GetMinimizeButtonOffset() +
         kNewAvatarButtonOffset;
 
   // We need to offset the button correctly in maximized mode, so that the
   // custom glass style aligns with the native control glass style. The
   // glass shadow is off by 1px, which was determined by visual inspection.
   const int shadow_height = GetLayoutConstant(TABSTRIP_TOP_SHADOW_HEIGHT);
   int button_y = frame()->IsMaximized() ?
       (NonClientTopBorderHeight() + shadow_height - 1) : 1;
 
   new_avatar_button()->SetBounds(
       button_x,
       button_y,
       label_size.width(),
       gfx::win::GetSystemMetricsInDIP(SM_CYMENUSIZE) + 1);
 }
 
 void GlassBrowserFrameView::LayoutAvatar() {
-  // Even though the avatar is used for both incognito and profiles we always
-  // use the incognito icon to layout the avatar button. The profile icon
-  // can be customized so we can't depend on its size to perform layout.
   gfx::ImageSkia incognito_icon = browser_view()->GetOTRAvatarIcon();
 
   int avatar_x = NonClientBorderThickness() + kAvatarLeftSpacing;
   // Move this avatar icon by the size of window controls to prevent it from
   // being rendered over them in RTL languages. This code also needs to adjust
   // the width of a tab strip to avoid decreasing this size twice. (See the
   // comment in GetBoundsForTabStrip().)
   if (base::i18n::IsRTL())
     avatar_x += width() - frame()->GetMinimizeButtonOffset();
 
@@ skipping 104 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;
   }
 }