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

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

Issue 2851543002: Update avatar button to MD (part 1) (Closed)
Patch Set: Rebased on CL 2868293002 [Rename new_avatar_button.* to avatar_button] Created 3 years, 7 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_AVATAR_BUTTON_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_BUTTON_H_
6 #define CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_BUTTON_H_ 6 #define CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_BUTTON_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/scoped_observer.h"
9 #include "chrome/browser/profiles/profile_attributes_storage.h" 10 #include "chrome/browser/profiles/profile_attributes_storage.h"
10 #include "chrome/browser/ui/avatar_button_error_controller.h" 11 #include "chrome/browser/ui/avatar_button_error_controller.h"
11 #include "chrome/browser/ui/avatar_button_error_controller_delegate.h" 12 #include "chrome/browser/ui/avatar_button_error_controller_delegate.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/controls/button/label_button.h"
14 15
15 class AvatarButtonDelegate;
16 class Profile; 16 class Profile;
17 17
18 // Avatar button that displays the active profile's name in the caption area. 18 // Base class for avatar buttons that display the active profile's name in the
19 class NewAvatarButton : public views::LabelButton, 19 // caption area.
20 public AvatarButtonErrorControllerDelegate, 20 class AvatarButton : public views::LabelButton,
21 public ProfileAttributesStorage::Observer { 21 public AvatarButtonErrorControllerDelegate,
22 public ProfileAttributesStorage::Observer {
22 public: 23 public:
23 NewAvatarButton(AvatarButtonDelegate* delegate, 24 AvatarButton(views::ButtonListener* listener,
24 AvatarButtonStyle button_style, 25 AvatarButtonStyle button_style,
25 Profile* profile); 26 Profile* profile);
26 ~NewAvatarButton() override;
27 27
28 // Views::LabelButton 28 // views::LabelButton:
29 bool OnMousePressed(const ui::MouseEvent& event) override; 29 void OnGestureEvent(ui::GestureEvent* event) override;
30 void OnMouseReleased(const ui::MouseEvent& event) override; 30 gfx::Size GetMinimumSize() const override;
31 gfx::Size GetPreferredSize() const override;
32 std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight()
33 const override;
31 34
32 // Views 35 protected:
33 void OnGestureEvent(ui::GestureEvent* event) override; 36 // views::LabelButton:
37 bool ShouldUseFloodFillInkDrop() const override;
34 38
35 private: 39 private:
36 friend class ProfileChooserViewExtensionsTest; 40 friend class ProfileChooserViewExtensionsTest;
37 41
38 // AvatarButtonErrorControllerDelegate: 42 // AvatarButtonErrorControllerDelegate:
39 void OnAvatarErrorChanged() override; 43 void OnAvatarErrorChanged() override;
40 44
41 // ProfileAttributesStorage::Observer: 45 // ProfileAttributesStorage::Observer:
42 void OnProfileAdded(const base::FilePath& profile_path) override; 46 void OnProfileAdded(const base::FilePath& profile_path) override;
43 void OnProfileWasRemoved(const base::FilePath& profile_path, 47 void OnProfileWasRemoved(const base::FilePath& profile_path,
44 const base::string16& profile_name) override; 48 const base::string16& profile_name) override;
45 void OnProfileNameChanged(const base::FilePath& profile_path, 49 void OnProfileNameChanged(const base::FilePath& profile_path,
46 const base::string16& old_profile_name) override; 50 const base::string16& old_profile_name) override;
47 void OnProfileSupervisedUserIdChanged( 51 void OnProfileSupervisedUserIdChanged(
48 const base::FilePath& profile_path) override; 52 const base::FilePath& profile_path) override;
49 53
50 // Called when the profile info cache or signin/sync error has changed, which 54 // Called when the profile info cache or signin/sync error has changed, which
51 // means we might have to update the icon/text of the button. 55 // means we might have to update the icon/text of the button.
52 void Update(); 56 void Update();
53 57
54 AvatarButtonDelegate* delegate_; 58 // Sets generic_avatar_ to the image with the specified IDR.
59 void SetButtonAvatar(int avatar_idr);
60
55 AvatarButtonErrorController error_controller_; 61 AvatarButtonErrorController error_controller_;
56 Profile* profile_; 62 Profile* profile_;
63 ScopedObserver<ProfileAttributesStorage, AvatarButton> profile_observer_;
57 64
58 // The icon displayed instead of the profile name in the local profile case. 65 // The icon displayed instead of the profile name in the local profile case.
59 // Different assets are used depending on the OS version. 66 // Different assets are used depending on the OS version.
60 gfx::ImageSkia generic_avatar_; 67 gfx::ImageSkia generic_avatar_;
61 68
62 // This is used to check if the bubble was showing during the mouse pressed 69 // True to use the Windows 10 native (non-themed) button, which is drawn using
63 // event. If this is true then the mouse released event is ignored to prevent 70 // a vector icon and can change height to slide atop the tabstrip. False to
64 // the bubble from reshowing. 71 // use the old PNG, fixed-size icon button or a themed button.
65 bool suppress_mouse_released_action_; 72 bool use_win10_native_button_;
66 73
67 DISALLOW_COPY_AND_ASSIGN(NewAvatarButton); 74 DISALLOW_COPY_AND_ASSIGN(AvatarButton);
68 }; 75 };
69 76
70 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_BUTTON_H_ 77 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_BUTTON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698