Simplify some old avatar menu button code.

chrome/browser/ui/views/frame/browser_non_client_frame_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
 
 #include "chrome/browser/profiles/profile_attributes_storage.h"
+#include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
 #include "ui/views/window/non_client_view.h"
 
-class AvatarMenuButton;
 class BrowserFrame;
 class BrowserView;
 
 // A specialization of the NonClientFrameView object that provides additional
 // Browser-specific methods.
 class BrowserNonClientFrameView : public views::NonClientFrameView,
                                   public ProfileAttributesStorage::Observer {
  public:
   BrowserNonClientFrameView(BrowserFrame* frame, BrowserView* browser_view);
   ~BrowserNonClientFrameView() override;
 
   BrowserView* browser_view() const { return browser_view_; }
   BrowserFrame* frame() const { return frame_; }
-  AvatarMenuButton* avatar_button() const { return avatar_button_; }
 
   // Called when BrowserView creates all it's child views.
   virtual void OnBrowserViewInitViewsComplete();
 
   // Retrieves the bounds, in non-client view coordinates within which the
   // TabStrip should be laid out.
   virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const = 0;
 
   // Returns the inset of the topmost view in the client view from the top of
   // the non-client view. The topmost view depends on the window type. The
@@ skipping 39 matching lines @@
   SkColor GetFrameColor(bool active) const;
   gfx::ImageSkia GetFrameImage(bool active) const;
   gfx::ImageSkia GetFrameOverlayImage(bool active) const;
 
   // Convenience versions of the above which use ShouldPaintAsActive() for
   // |active|.
   SkColor GetFrameColor() const;
   gfx::ImageSkia GetFrameImage() const;
   gfx::ImageSkia GetFrameOverlayImage() const;
 
   // Update the profile switcher button if one should exist. Otherwise, update

[Peter Kasting, 2016/05/17 03:51:42]

Nit: While here: Update -> Updates (2 places)

[Evan Stade, 2016/05/17 18:13:09]

Done.

-  // the incognito avatar, or profile avatar for teleported frames in ChromeOS.
-  virtual void UpdateAvatar() = 0;
+  // the icon that indicates incognito (or a teleported window in ChromeOS).
+  virtual void UpdateProfileIcons() = 0;
 
-  // Updates the title and icon of the old avatar button.
-  void UpdateOldAvatarButton();
+  // Updates the icon that indicates incognito/teleportation state.
+  void UpdateProfileIndicatorIcon();
+
+  views::View* profile_indicator() const { return profile_indicator_; }

[Peter Kasting, 2016/05/17 03:51:42]

Const accessors shouldn't return non-const pointers; either make this non-const
or have it return a const pointer.

[Evan Stade, 2016/05/17 18:13:09]

Done.

 
  private:
   // views::NonClientFrameView:
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
   void ActivationChanged(bool active) override;
 
   // ProfileAttributesStorage::Observer:
   void OnProfileAdded(const base::FilePath& profile_path) override;
   void OnProfileWasRemoved(const base::FilePath& profile_path,
                            const base::string16& profile_name) override;
   void OnProfileAvatarChanged(const base::FilePath& profile_path) override;
 
   // Gets a theme provider that should be non-null even before we're added to a
   // view hierarchy.
   const ui::ThemeProvider* GetThemeProviderForProfile() const;
 
   // Draws a taskbar icon if avatars are enabled, erases it otherwise.
   void UpdateTaskbarDecoration();
 
   // The frame that hosts this view.
   BrowserFrame* frame_;
 
   // The BrowserView hosted within this View.
   BrowserView* browser_view_;
 
-  // Menu button that displays the incognito icon. May be null for some frame
-  // styles. TODO(anthonyvd): simplify/rename.
-  AvatarMenuButton* avatar_button_ = nullptr;
+  // On desktop, this is used to show an incognito indicator. On CrOS, it's also

[Peter Kasting, 2016/05/17 03:51:42]

Nit: indicator -> icon?

[Evan Stade, 2016/05/17 18:13:09]

Done.

+  // used for teleported windows (in multi-profile mode).
+  ProfileIndicatorIcon* profile_indicator_ = nullptr;

[Peter Kasting, 2016/05/17 03:51:42]

Nit: I would make the type name and member name match exactly, whatever you
choose.

It's also a bit weird to me to use an initializer here in the declaration for
this variable but not the other members... would kinda prefer changing them all
(or else none)

[Evan Stade, 2016/05/17 18:13:09]

done
well, I did change none :). But I'll move this one to the initializer list.

 
   DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameView);
 };
 
 namespace chrome {
 
 // Provided by a browser_non_client_frame_view_factory_*.cc implementation
 BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
     BrowserFrame* frame, BrowserView* browser_view);
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_