Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2738)

Unified Diff: chrome/browser/ui/views/frame/avatar_button_manager.h

Issue 2851543002: Update avatar button to MD (part 1) (Closed)
Patch Set: Renamed NewAvatarButton->ThemedAvatarButton and MaterialDesignAvatarButton->Win10NativeAvatarButton… Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/avatar_button_manager.h
diff --git a/chrome/browser/ui/views/frame/avatar_button_manager.h b/chrome/browser/ui/views/frame/avatar_button_manager.h
index ca3aa5bdf0cd895fb93f0f53f55adc94ac0071ee..d817fcbdf07cd85b3062782185a724bf51fc0d9a 100644
--- a/chrome/browser/ui/views/frame/avatar_button_manager.h
+++ b/chrome/browser/ui/views/frame/avatar_button_manager.h
@@ -5,14 +5,15 @@
#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_AVATAR_BUTTON_MANAGER_H_
#define CHROME_BROWSER_UI_VIEWS_FRAME_AVATAR_BUTTON_MANAGER_H_
-#include "chrome/browser/ui/views/profiles/avatar_button_delegate.h"
+#include "chrome/browser/ui/views/profiles/avatar_button.h"
#include "chrome/browser/ui/views/profiles/avatar_button_style.h"
+#include "ui/views/controls/button/menu_button_listener.h"
class BrowserNonClientFrameView;
// Manages an avatar button displayed in a browser frame. The button displays
// the name of the active or guest profile, and may be null.
-class AvatarButtonManager : public AvatarButtonDelegate {
+class AvatarButtonManager : public views::MenuButtonListener {
public:
explicit AvatarButtonManager(BrowserNonClientFrameView* frame_view);
@@ -20,21 +21,19 @@ class AvatarButtonManager : public AvatarButtonDelegate {
// properties.
void Update(AvatarButtonStyle style);
- // Gets the avatar button as a view::View.
- views::View* view() const { return view_; }
+ AvatarButton* button() const { return button_; }
- private:
- // AvatarButtonDelegate:
- void ButtonPreferredSizeChanged() override;
-
- // views::ButtonListener:
- void ButtonPressed(views::Button* sender, const ui::Event& event) override;
+ // MenuButtonListener:
+ void OnMenuButtonClicked(views::MenuButton* source,
+ const gfx::Point& point,
+ const ui::Event* event) override;
+ private:
BrowserNonClientFrameView* frame_view_; // Weak. Owns |this|.
// Menu button that displays the name of the active or guest profile.
// May be null and will not be displayed for off the record profiles.
- views::View* view_; // Owned by views hierarchy.
+ AvatarButton* button_; // Owned by views hierarchy.
DISALLOW_COPY_AND_ASSIGN(AvatarButtonManager);
};

Powered by Google App Engine
This is Rietveld 408576698