Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "chrome/browser/profiles/profile_info_cache_observer.h" | 8 #include "chrome/browser/profiles/profile_info_cache_observer.h" |
| 9 #include "components/signin/core/browser/signin_error_controller.h" | 9 #include "components/signin/core/browser/signin_error_controller.h" |
| 10 #include "ui/views/controls/button/menu_button.h" | 10 #include "ui/views/controls/button/menu_button.h" |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 21 THEMED_BUTTON, // Used in a themed browser window. | 21 THEMED_BUTTON, // Used in a themed browser window. |
| 22 NATIVE_BUTTON, // Used in a native aero or metro window. | 22 NATIVE_BUTTON, // Used in a native aero or metro window. |
| 23 }; | 23 }; |
| 24 | 24 |
| 25 NewAvatarButton(views::ButtonListener* listener, | 25 NewAvatarButton(views::ButtonListener* listener, |
| 26 const base::string16& profile_name, | 26 const base::string16& profile_name, |
| 27 AvatarButtonStyle button_style, | 27 AvatarButtonStyle button_style, |
| 28 Browser* browser); | 28 Browser* browser); |
| 29 virtual ~NewAvatarButton(); | 29 virtual ~NewAvatarButton(); |
| 30 | 30 |
| 31 // Overridden from Views::MenuButton | |
|
msw
2014/08/21 19:57:44
nit: remove "Overridden from" to match the Profile
Mike Lerman
2014/08/21 20:02:32
Done.
| |
| 32 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; | |
| 33 virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; | |
| 34 | |
| 31 private: | 35 private: |
| 32 friend class NewAvatarMenuButtonTest; | 36 friend class NewAvatarMenuButtonTest; |
| 33 friend class ProfileChooserViewBrowserTest; | 37 friend class ProfileChooserViewBrowserTest; |
| 34 FRIEND_TEST_ALL_PREFIXES(NewAvatarMenuButtonTest, SignOut); | 38 FRIEND_TEST_ALL_PREFIXES(NewAvatarMenuButtonTest, SignOut); |
| 35 FRIEND_TEST_ALL_PREFIXES(ProfileChooserViewBrowserTest, ViewProfileUMA); | 39 FRIEND_TEST_ALL_PREFIXES(ProfileChooserViewBrowserTest, ViewProfileUMA); |
| 36 | 40 |
| 37 // ProfileInfoCacheObserver: | 41 // ProfileInfoCacheObserver: |
| 38 virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE; | 42 virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE; |
| 39 virtual void OnProfileWasRemoved( | 43 virtual void OnProfileWasRemoved( |
| 40 const base::FilePath& profile_path, | 44 const base::FilePath& profile_path, |
| 41 const base::string16& profile_name) OVERRIDE; | 45 const base::string16& profile_name) OVERRIDE; |
| 42 virtual void OnProfileNameChanged( | 46 virtual void OnProfileNameChanged( |
| 43 const base::FilePath& profile_path, | 47 const base::FilePath& profile_path, |
| 44 const base::string16& old_profile_name) OVERRIDE; | 48 const base::string16& old_profile_name) OVERRIDE; |
| 45 virtual void OnProfileSupervisedUserIdChanged( | 49 virtual void OnProfileSupervisedUserIdChanged( |
| 46 const base::FilePath& profile_path) OVERRIDE; | 50 const base::FilePath& profile_path) OVERRIDE; |
| 47 | 51 |
| 48 // SigninErrorController::Observer: | 52 // SigninErrorController::Observer: |
| 49 virtual void OnErrorChanged() OVERRIDE; | 53 virtual void OnErrorChanged() OVERRIDE; |
| 50 | 54 |
| 51 // Called when the profile info cache has changed, which means we might | 55 // Called when the profile info cache has changed, which means we might |
| 52 // have to re-display the profile name. | 56 // have to re-display the profile name. |
| 53 void UpdateAvatarButtonAndRelayoutParent(); | 57 void UpdateAvatarButtonAndRelayoutParent(); |
| 54 | 58 |
| 55 Browser* browser_; | 59 Browser* browser_; |
| 56 | 60 |
| 61 // This is used to check if the bubble was showing during the mouse pressed | |
| 62 // event. If this is true then the mouse released event is ignored to prevent | |
| 63 // the bubble from reshowing. | |
| 64 bool suppress_mouse_released_action_; | |
| 65 | |
| 57 DISALLOW_COPY_AND_ASSIGN(NewAvatarButton); | 66 DISALLOW_COPY_AND_ASSIGN(NewAvatarButton); |
| 58 }; | 67 }; |
| 59 | 68 |
| 60 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_ | 69 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_ |
| OLD | NEW |