Vectorize MD otr frame icon

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 "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"
@@ skipping 190 matching lines @@
 #if defined(ENABLE_SUPERVISED_USERS)
       Profile* profile = browser_view_->browser()->profile();
       if (profile->IsSupervised() && !supervised_user_avatar_label_) {
         supervised_user_avatar_label_ =
             new SupervisedUserAvatarLabel(browser_view_);
         supervised_user_avatar_label_->set_id(
             VIEW_ID_SUPERVISED_USER_AVATAR_LABEL);
         AddChildView(supervised_user_avatar_label_);
       }
 #endif
-      avatar_button_ = new AvatarMenuButton(
-          browser_view_->browser(), !browser_view_->IsRegularOrGuestSession());
+      avatar_button_ = new AvatarMenuButton(browser_view_);
       avatar_button_->set_id(VIEW_ID_AVATAR_BUTTON);
       AddChildView(avatar_button_);
       // Invalidate here because adding a child does not invalidate the layout.
       InvalidateLayout();
       frame_->GetRootView()->Layout();
     }
   } else if (avatar_button_) {
 #if defined(ENABLE_SUPERVISED_USERS)
     // The avatar label can just be there if there is also an avatar button.
     if (supervised_user_avatar_label_) {
       RemoveChildView(supervised_user_avatar_label_);
       delete supervised_user_avatar_label_;
       supervised_user_avatar_label_ = nullptr;
     }
 #endif
     RemoveChildView(avatar_button_);
     delete avatar_button_;
     avatar_button_ = nullptr;
     frame_->GetRootView()->Layout();
   }
 
   gfx::Image avatar;
   gfx::Image taskbar_badge_avatar;
   bool is_rectangle = false;
 
   // Update the avatar button in the window frame and the taskbar overlay.
   bool should_show_avatar_menu =
       avatar_button_ || AvatarMenu::ShouldShowAvatarMenu();
 
-  if (!AvatarMenuButton::GetAvatarImages(
-          browser_view_->browser()->profile(), should_show_avatar_menu, &avatar,
-          &taskbar_badge_avatar, &is_rectangle)) {
+  if (!AvatarMenuButton::GetAvatarImages(browser_view_, should_show_avatar_menu,
+                                         &avatar, &taskbar_badge_avatar,
+                                         &is_rectangle)) {
     return;
   }
 
   // Disable the menu when we should not show the menu.
   if (avatar_button_ && !AvatarMenu::ShouldShowAvatarMenu())
     avatar_button_->SetEnabled(false);
   if (avatar_button_)
     avatar_button_->SetAvatarIcon(avatar, is_rectangle);
 }
 
@@ skipping 45 matching lines @@
 }
 
 void BrowserNonClientFrameView::UpdateTaskbarDecoration() {
   gfx::Image avatar;
   gfx::Image taskbar_badge_avatar;
   bool is_rectangle;
   // Only need to update the taskbar overlay here.  If GetAvatarImages()
   // returns false, don't bother trying to update the taskbar decoration since
   // the returned images are not initialized.  This can happen if the user
   // deletes the current profile.
-  if (AvatarMenuButton::GetAvatarImages(browser_view_->browser()->profile(),
-                                        AvatarMenu::ShouldShowAvatarMenu(),
-                                        &avatar, &taskbar_badge_avatar,
-                                        &is_rectangle)) {
+  if (AvatarMenuButton::GetAvatarImages(
+          browser_view_, AvatarMenu::ShouldShowAvatarMenu(), &avatar,
+          &taskbar_badge_avatar, &is_rectangle)) {
     // For popups and panels which don't have the avatar button, we still
     // need to draw the taskbar decoration. Even though we have an icon on the
     // window's relaunch details, we draw over it because the user may have
     // pinned the badge-less Chrome shortcut which will cause windows to ignore
     // the relaunch details.
     // TODO(calamity): ideally this should not be necessary but due to issues
     // with the default shortcut being pinned, we add the runtime badge for
     // safety. See crbug.com/313800.
     bool show_decoration = AvatarMenu::ShouldShowAvatarMenu() &&
         !browser_view_->browser()->profile()->IsGuestSession();
     // In tests, make sure that the browser process and profile manager are
     // valid before using.
     if (g_browser_process && g_browser_process->profile_manager()) {
       const ProfileInfoCache& cache =
           g_browser_process->profile_manager()->GetProfileInfoCache();
       show_decoration = show_decoration && cache.GetNumberOfProfiles() > 1;
     }
     chrome::DrawTaskbarDecoration(frame_->GetNativeWindow(),
         show_decoration
             ? (taskbar_badge_avatar.IsEmpty() ? &avatar : &taskbar_badge_avatar)
             : nullptr);
   }
 }