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

Side by Side Diff: chrome/browser/ui/views/profiles/new_avatar_button.h

Issue 2832823002: Update avatar button to MD (Closed)
Patch Set: Fixed ProfileChooserViewExtensionsTest browser tests 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_
6 #define CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_ 6 #define CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "chrome/browser/profiles/profile_attributes_storage.h" 9 #include "chrome/browser/profiles/profile_attributes_storage.h"
10 #include "chrome/browser/ui/avatar_button_error_controller.h" 10 #include "chrome/browser/ui/avatar_button_error_controller.h"
11 #include "chrome/browser/ui/avatar_button_error_controller_delegate.h" 11 #include "chrome/browser/ui/avatar_button_error_controller_delegate.h"
12 #include "chrome/browser/ui/views/frame/browser_view.h"
12 #include "chrome/browser/ui/views/profiles/avatar_button_style.h" 13 #include "chrome/browser/ui/views/profiles/avatar_button_style.h"
13 #include "ui/views/controls/button/label_button.h" 14 #include "ui/views/animation/ink_drop.h"
15 #include "ui/views/controls/button/menu_button.h"
14 16
15 class AvatarButtonDelegate; 17 class AvatarButtonDelegate;
16 class Profile; 18 class Profile;
17 19
18 // Avatar button that displays the active profile's name in the caption area. 20 class AvatarButton : public views::MenuButton,
19 class NewAvatarButton : public views::LabelButton, 21 public AvatarButtonErrorControllerDelegate,
20 public AvatarButtonErrorControllerDelegate, 22 public ProfileAttributesStorage::Observer {
21 public ProfileAttributesStorage::Observer {
22 public: 23 public:
23 NewAvatarButton(AvatarButtonDelegate* delegate, 24 AvatarButton(AvatarButtonDelegate* delegate, Profile* profile);
24 AvatarButtonStyle button_style, 25 ~AvatarButton() override;
25 Profile* profile);
26 ~NewAvatarButton() override;
27 26
28 // Views::LabelButton 27 // Update the avatar button height previously calculated by GetPreferredSize,
29 bool OnMousePressed(const ui::MouseEvent& event) override; 28 // if needed, now that the button's position is known.
30 void OnMouseReleased(const ui::MouseEvent& event) override; 29 virtual void UpdateButtonHeightForPosition(const int button_x,
30 int* button_height) const {}
31 31
32 // Views 32 protected:
33 void OnGestureEvent(ui::GestureEvent* event) override; 33 // MenuButton
34 bool IsTriggerableEvent(const ui::Event& event) override;
35
36 // Called when the profile info cache or signin/sync error has changed, which
37 // means we might have to update the icon/text of the button.
38 void Update();
39
40 void SetButtonAndBorder(const int button_idr,
41 const int normal_image_set[],
42 const int hover_image_set[],
43 const int pressed_image_set[]);
34 44
35 private: 45 private:
36 friend class ProfileChooserViewExtensionsTest; 46 friend class ProfileChooserViewExtensionsTest;
37 47
38 // AvatarButtonErrorControllerDelegate: 48 // AvatarButtonErrorControllerDelegate:
39 void OnAvatarErrorChanged() override; 49 void OnAvatarErrorChanged() override;
40 50
41 // ProfileAttributesStorage::Observer: 51 // ProfileAttributesStorage::Observer:
42 void OnProfileAdded(const base::FilePath& profile_path) override; 52 void OnProfileAdded(const base::FilePath& profile_path) override;
43 void OnProfileWasRemoved(const base::FilePath& profile_path, 53 void OnProfileWasRemoved(const base::FilePath& profile_path,
44 const base::string16& profile_name) override; 54 const base::string16& profile_name) override;
45 void OnProfileNameChanged(const base::FilePath& profile_path, 55 void OnProfileNameChanged(const base::FilePath& profile_path,
46 const base::string16& old_profile_name) override; 56 const base::string16& old_profile_name) override;
47 void OnProfileSupervisedUserIdChanged( 57 void OnProfileSupervisedUserIdChanged(
48 const base::FilePath& profile_path) override; 58 const base::FilePath& profile_path) override;
49 59
50 // Called when the profile info cache or signin/sync error has changed, which 60 void UpdateButton(bool use_generic_button,
51 // means we might have to update the icon/text of the button. 61 Profile* profile,
52 void Update(); 62 AvatarButtonErrorController* error_controller);
53 63
54 AvatarButtonDelegate* delegate_; 64 AvatarButtonDelegate* delegate_;
55 AvatarButtonErrorController error_controller_; 65 AvatarButtonErrorController error_controller_;
56 Profile* profile_; 66 Profile* profile_;
57 67
58 // The icon displayed instead of the profile name in the local profile case. 68 // The icon displayed instead of the profile name in the local profile case.
59 // Different assets are used depending on the OS version. 69 // Different assets are used depending on the OS version.
60 gfx::ImageSkia generic_avatar_; 70 gfx::ImageSkia generic_avatar_;
61 71
62 // This is used to check if the bubble was showing during the mouse pressed 72 DISALLOW_COPY_AND_ASSIGN(AvatarButton);
63 // event. If this is true then the mouse released event is ignored to prevent 73 };
64 // the bubble from reshowing. 74
65 bool suppress_mouse_released_action_; 75 // Avatar button that displays the active profile's name in the caption area.
76 class NewAvatarButton : public AvatarButton {
77 public:
78 NewAvatarButton(AvatarButtonDelegate* delegate,
79 AvatarButtonStyle button_style,
80 Profile* profile);
81 ~NewAvatarButton() override;
82
83 protected:
84 gfx::Size GetPreferredSize() const override;
66 85
67 DISALLOW_COPY_AND_ASSIGN(NewAvatarButton); 86 DISALLOW_COPY_AND_ASSIGN(NewAvatarButton);
68 }; 87 };
69 88
89 class MaterialDesignAvatarButton : public AvatarButton {
90 public:
91 MaterialDesignAvatarButton(AvatarButtonDelegate* delegate,
92 Profile* profile,
93 BrowserView* browser_view);
94 ~MaterialDesignAvatarButton() override;
95
96 void UpdateButtonHeightForPosition(const int button_x,
97 int* button_height) const override;
98
99 protected:
100 gfx::Size GetPreferredSize() const override;
101 std::unique_ptr<views::InkDrop> CreateInkDrop() override;
102 std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override;
103 std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight()
104 const override;
105
106 private:
107 BrowserView* browser_view_;
108
109 DISALLOW_COPY_AND_ASSIGN(MaterialDesignAvatarButton);
110 };
111
70 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_ 112 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698