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 #include "chrome/browser/ui/views/profiles/new_avatar_button.h" | 5 #include "chrome/browser/ui/views/profiles/new_avatar_button.h" |
6 | 6 |
7 #include "base/win/windows_version.h" | 7 #include "base/win/windows_version.h" |
8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
9 #include "chrome/browser/profiles/profile_manager.h" | 9 #include "chrome/browser/profiles/profile_manager.h" |
10 #include "chrome/browser/profiles/profiles_state.h" | 10 #include "chrome/browser/profiles/profiles_state.h" |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
113 NewAvatarButton::~NewAvatarButton() { | 113 NewAvatarButton::~NewAvatarButton() { |
114 g_browser_process->profile_manager()-> | 114 g_browser_process->profile_manager()-> |
115 GetProfileInfoCache().RemoveObserver(this); | 115 GetProfileInfoCache().RemoveObserver(this); |
116 SigninErrorController* error = | 116 SigninErrorController* error = |
117 profiles::GetSigninErrorController(browser_->profile()); | 117 profiles::GetSigninErrorController(browser_->profile()); |
118 if (error) | 118 if (error) |
119 error->RemoveObserver(this); | 119 error->RemoveObserver(this); |
120 } | 120 } |
121 | 121 |
122 bool NewAvatarButton::OnMousePressed(const ui::MouseEvent& event) { | 122 bool NewAvatarButton::OnMousePressed(const ui::MouseEvent& event) { |
123 // Prevent the bubble from being re-shown if it's already showing. | 123 // Prevent the bubble from being re-shown if it's already showing in the |
124 suppress_mouse_released_action_ = ProfileChooserView::IsShowing(); | 124 // current |
msw
2015/05/20 00:18:11
nit: fix line wrapping...
gogerald1
2015/05/20 14:06:24
Done.
| |
125 // browser and Hide it if it's showing in another browser. | |
126 ProfileChooserView::ShowingType show_type = | |
127 ProfileChooserView::IsShowingInBrowser(browser_); | |
128 if (show_type == ProfileChooserView::IS_SHOWING) | |
129 suppress_mouse_released_action_ = true; | |
130 else if (show_type == ProfileChooserView::IS_SHOWING_IN_ANOTHER_BROWSER) | |
131 ProfileChooserView::Hide(); | |
125 return LabelButton::OnMousePressed(event); | 132 return LabelButton::OnMousePressed(event); |
126 } | 133 } |
127 | 134 |
128 void NewAvatarButton::OnMouseReleased(const ui::MouseEvent& event) { | 135 void NewAvatarButton::OnMouseReleased(const ui::MouseEvent& event) { |
129 if (suppress_mouse_released_action_) | 136 if (suppress_mouse_released_action_) |
130 suppress_mouse_released_action_ = false; | 137 suppress_mouse_released_action_ = false; |
131 else | 138 else |
132 LabelButton::OnMouseReleased(event); | 139 LabelButton::OnMouseReleased(event); |
133 } | 140 } |
134 | 141 |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
202 SetImage(views::Button::STATE_NORMAL, gfx::ImageSkia()); | 209 SetImage(views::Button::STATE_NORMAL, gfx::ImageSkia()); |
203 } | 210 } |
204 | 211 |
205 // If we are not using the generic button, then reset the spacing between | 212 // If we are not using the generic button, then reset the spacing between |
206 // the text and the possible authentication error icon. | 213 // the text and the possible authentication error icon. |
207 const int kDefaultImageTextSpacing = 5; | 214 const int kDefaultImageTextSpacing = 5; |
208 SetImageLabelSpacing(use_generic_button ? 0 : kDefaultImageTextSpacing); | 215 SetImageLabelSpacing(use_generic_button ? 0 : kDefaultImageTextSpacing); |
209 | 216 |
210 PreferredSizeChanged(); | 217 PreferredSizeChanged(); |
211 } | 218 } |
OLD | NEW |