Remove pre-MD incognito frame avatar.

chrome/browser/ui/views/frame/browser_non_client_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/browser_non_client_frame_view.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/material_design/material_design_controller.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
-#include "ui/resources/grit/ui_resources.h"
 #include "ui/views/background.h"
-#include "ui/views/resources/grit/views_resources.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/ui/views/frame/taskbar_decorator_win.h"
 #endif
 
 BrowserNonClientFrameView::BrowserNonClientFrameView(BrowserFrame* frame,
                                                      BrowserView* browser_view)
     : frame_(frame),
       browser_view_(browser_view),
       profile_indicator_icon_(nullptr) {
   // The profile manager may by null in tests.
   if (g_browser_process->profile_manager()) {
     g_browser_process->profile_manager()->
         GetProfileAttributesStorage().AddObserver(this);
   }
 }
 
 BrowserNonClientFrameView::~BrowserNonClientFrameView() {
   // The profile manager may by null in tests.
   if (g_browser_process->profile_manager()) {
     g_browser_process->profile_manager()->
         GetProfileAttributesStorage().RemoveObserver(this);
   }
 }
 
 void BrowserNonClientFrameView::OnBrowserViewInitViewsComplete() {}
 
 gfx::ImageSkia BrowserNonClientFrameView::GetIncognitoAvatarIcon() const {
-  if (!ui::MaterialDesignController::IsModeMaterial())
-    return *GetThemeProviderForProfile()->GetImageSkiaNamed(IDR_OTR_ICON);
   const SkColor icon_color = color_utils::PickContrastingColor(
       SK_ColorWHITE, gfx::kChromeIconGrey, GetFrameColor());
   return gfx::CreateVectorIcon(gfx::VectorIconId::INCOGNITO, icon_color);
 }
 
 SkColor BrowserNonClientFrameView::GetToolbarTopSeparatorColor() const {
   const auto color_id =
       ShouldPaintAsActive()
           ? ThemeProperties::COLOR_TOOLBAR_TOP_SEPARATOR
           : ThemeProperties::COLOR_TOOLBAR_TOP_SEPARATOR_INACTIVE;
@@ skipping 33 matching lines @@
              : ThemeProperties::COLOR_FRAME_INACTIVE;
   return ShouldPaintAsThemed()
              ? GetThemeProviderForProfile()->GetColor(color_id)
              : ThemeProperties::GetDefaultColor(color_id,
                                                 browser_view_->IsIncognito());
 }
 
 gfx::ImageSkia BrowserNonClientFrameView::GetFrameImage(bool active) const {
   const ui::ThemeProvider* tp = frame_->GetThemeProvider();
   int frame_image_id = active ? IDR_THEME_FRAME : IDR_THEME_FRAME_INACTIVE;
-
-  // |default_uses_color| means the default frame is painted with a solid color.
-  // When false, the default frame is painted with assets.
-#if defined(OS_CHROMEOS)
-  bool default_uses_color = true;
-#else
-  bool default_uses_color = ui::MaterialDesignController::IsModeMaterial();
-#endif
-  if (default_uses_color) {
-    return ShouldPaintAsThemed() && (tp->HasCustomImage(frame_image_id) ||
-                                     tp->HasCustomImage(IDR_THEME_FRAME))
-               ? *tp->GetImageSkiaNamed(frame_image_id)
-               : gfx::ImageSkia();
-  }
-
-  return ShouldPaintAsThemed()
+  return ShouldPaintAsThemed() && (tp->HasCustomImage(frame_image_id) ||
+                                   tp->HasCustomImage(IDR_THEME_FRAME))
              ? *tp->GetImageSkiaNamed(frame_image_id)
-             : *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-                   frame_image_id);
+             : gfx::ImageSkia();
 }
 
 gfx::ImageSkia BrowserNonClientFrameView::GetFrameOverlayImage(
     bool active) const {
   if (browser_view_->IsIncognito() || !browser_view_->IsBrowserTypeNormal())
     return gfx::ImageSkia();
 
   const ui::ThemeProvider* tp = frame_->GetThemeProvider();
   int frame_overlay_image_id =
       active ? IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE;
@@ skipping 21 matching lines @@
     AddChildView(profile_indicator_icon_);
     // Invalidate here because adding a child does not invalidate the layout.
     InvalidateLayout();
     frame_->GetRootView()->Layout();
   }
 
   gfx::Image icon;
   const Profile* profile = browser_view()->browser()->profile();
   if (profile->GetProfileType() == Profile::INCOGNITO_PROFILE) {
     icon = gfx::Image(GetIncognitoAvatarIcon());
-    if (!ui::MaterialDesignController::IsModeMaterial())
-      profile_indicator_icon_->EnableCanvasFlippingForRTLUI(true);
   } else {
 #if defined(OS_CHROMEOS)
     AvatarMenu::GetImageForMenuButton(profile->GetPath(), &icon);
 #else
     NOTREACHED();
 #endif
   }
 
   profile_indicator_icon_->SetIcon(icon);
 }
 
 void BrowserNonClientFrameView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this)
     UpdateProfileIcons();
 }
 
 void BrowserNonClientFrameView::ActivationChanged(bool active) {
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    // On Windows, while deactivating the widget, this is called before the
-    // active HWND has actually been changed.  Since we want the avatar state to
-    // reflect that the window is inactive, we force NonClientFrameView to see
-    // the "correct" state as an override.
-    set_active_state_override(&active);
-    UpdateProfileIcons();
-    set_active_state_override(nullptr);
+  // On Windows, while deactivating the widget, this is called before the
+  // active HWND has actually been changed.  Since we want the avatar state to
+  // reflect that the window is inactive, we force NonClientFrameView to see
+  // the "correct" state as an override.

[Peter Kasting, 2016/10/24 23:36:00]

Nit: Rewrap to 80 cols

[Evan Stade, 2016/10/25 14:08:09]

Done.

+  set_active_state_override(&active);
+  UpdateProfileIcons();
+  set_active_state_override(nullptr);
 
-    // Changing the activation state may change the toolbar top separator color
-    // that's used as the stroke around tabs/the new tab button.
-    browser_view_->tabstrip()->SchedulePaint();
-  }
+  // Changing the activation state may change the toolbar top separator color
+  // that's used as the stroke around tabs/the new tab button.
+  browser_view_->tabstrip()->SchedulePaint();
 
   // Changing the activation state may change the visible frame color.
   SchedulePaint();
 }
 
 bool BrowserNonClientFrameView::DoesIntersectRect(const views::View* target,
                                                   const gfx::Rect& rect) const {
   DCHECK_EQ(target, this);
   if (!views::ViewTargeterDelegate::DoesIntersectRect(this, rect)) {
     // |rect| is outside the frame's bounds.
@@ skipping 86 matching lines @@
   // safety. See crbug.com/313800.
   gfx::Image decoration;
   AvatarMenu::GetImageForMenuButton(
       browser_view()->browser()->profile()->GetPath(), &decoration);
   // This can happen if the user deletes the current profile.
   if (decoration.IsEmpty())
     return;
   chrome::DrawTaskbarDecoration(frame_->GetNativeWindow(), &decoration);
 #endif
 }