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/profile_chooser_view.h" | 5 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/metrics/user_metrics.h" | 8 #include "base/metrics/user_metrics.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance(); | 148 ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance(); |
149 back_button->SetImage(views::ImageButton::STATE_NORMAL, | 149 back_button->SetImage(views::ImageButton::STATE_NORMAL, |
150 rb->GetImageSkiaNamed(IDR_BACK)); | 150 rb->GetImageSkiaNamed(IDR_BACK)); |
151 back_button->SetImage(views::ImageButton::STATE_HOVERED, | 151 back_button->SetImage(views::ImageButton::STATE_HOVERED, |
152 rb->GetImageSkiaNamed(IDR_BACK_H)); | 152 rb->GetImageSkiaNamed(IDR_BACK_H)); |
153 back_button->SetImage(views::ImageButton::STATE_PRESSED, | 153 back_button->SetImage(views::ImageButton::STATE_PRESSED, |
154 rb->GetImageSkiaNamed(IDR_BACK_P)); | 154 rb->GetImageSkiaNamed(IDR_BACK_P)); |
155 back_button->SetImage(views::ImageButton::STATE_DISABLED, | 155 back_button->SetImage(views::ImageButton::STATE_DISABLED, |
156 rb->GetImageSkiaNamed(IDR_BACK_D)); | 156 rb->GetImageSkiaNamed(IDR_BACK_D)); |
157 views::Button::ConfigureDefaultFocus(back_button); | 157 views::Button::ConfigureDefaultFocus(back_button); |
| 158 back_button->set_request_focus_on_press(true); |
158 return back_button; | 159 return back_button; |
159 } | 160 } |
160 | 161 |
161 // BackgroundColorHoverButton ------------------------------------------------- | 162 // BackgroundColorHoverButton ------------------------------------------------- |
162 | 163 |
163 // A custom button that allows for setting a background color when hovered over. | 164 // A custom button that allows for setting a background color when hovered over. |
164 class BackgroundColorHoverButton : public views::LabelButton { | 165 class BackgroundColorHoverButton : public views::LabelButton { |
165 public: | 166 public: |
166 BackgroundColorHoverButton(views::ButtonListener* listener, | 167 BackgroundColorHoverButton(views::ButtonListener* listener, |
167 const base::string16& text, | 168 const base::string16& text, |
168 const gfx::ImageSkia& icon) | 169 const gfx::ImageSkia& icon) |
169 : views::LabelButton(listener, text) { | 170 : views::LabelButton(listener, text) { |
170 SetImageLabelSpacing(views::kItemLabelSpacing); | 171 SetImageLabelSpacing(views::kItemLabelSpacing); |
171 SetBorder(views::Border::CreateEmptyBorder( | 172 SetBorder(views::Border::CreateEmptyBorder( |
172 0, views::kButtonHEdgeMarginNew, 0, views::kButtonHEdgeMarginNew)); | 173 0, views::kButtonHEdgeMarginNew, 0, views::kButtonHEdgeMarginNew)); |
173 SetMinSize(gfx::Size(0, | 174 SetMinSize(gfx::Size(0, |
174 kButtonHeight + views::kRelatedControlVerticalSpacing)); | 175 kButtonHeight + views::kRelatedControlVerticalSpacing)); |
175 SetImage(STATE_NORMAL, icon); | 176 SetImage(STATE_NORMAL, icon); |
176 Button::ConfigureDefaultFocus(this); | 177 Button::ConfigureDefaultFocus(this); |
| 178 set_request_focus_on_press(true); |
177 } | 179 } |
178 | 180 |
179 ~BackgroundColorHoverButton() override {} | 181 ~BackgroundColorHoverButton() override {} |
180 | 182 |
181 private: | 183 private: |
182 // views::LabelButton: | 184 // views::LabelButton: |
183 void OnPaint(gfx::Canvas* canvas) override { | 185 void OnPaint(gfx::Canvas* canvas) override { |
184 if ((state() == STATE_PRESSED) || | 186 if ((state() == STATE_PRESSED) || |
185 (state() == STATE_HOVERED)) { | 187 (state() == STATE_HOVERED)) { |
186 canvas->DrawColor(GetNativeTheme()->GetSystemColor( | 188 canvas->DrawColor(GetNativeTheme()->GetSystemColor( |
(...skipping 1205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1392 // Badge the email address if there's an authentication error. | 1394 // Badge the email address if there's an authentication error. |
1393 if (HasAuthError(browser_->profile())) { | 1395 if (HasAuthError(browser_->profile())) { |
1394 auth_error_email_button_ = | 1396 auth_error_email_button_ = |
1395 new RightAlignedIconLabelButton(this, avatar_item.username); | 1397 new RightAlignedIconLabelButton(this, avatar_item.username); |
1396 auth_error_email_button_->SetElideBehavior(gfx::ELIDE_EMAIL); | 1398 auth_error_email_button_->SetElideBehavior(gfx::ELIDE_EMAIL); |
1397 auth_error_email_button_->SetImage( | 1399 auth_error_email_button_->SetImage( |
1398 views::LabelButton::STATE_NORMAL, | 1400 views::LabelButton::STATE_NORMAL, |
1399 gfx::CreateVectorIcon(gfx::VectorIconId::WARNING, 18, | 1401 gfx::CreateVectorIcon(gfx::VectorIconId::WARNING, 18, |
1400 gfx::kChromeIconGrey)); | 1402 gfx::kChromeIconGrey)); |
1401 views::Button::ConfigureDefaultFocus(auth_error_email_button_); | 1403 views::Button::ConfigureDefaultFocus(auth_error_email_button_); |
| 1404 auth_error_email_button_->set_request_focus_on_press(true); |
1402 gfx::Insets insets = | 1405 gfx::Insets insets = |
1403 views::LabelButtonAssetBorder::GetDefaultInsetsForStyle( | 1406 views::LabelButtonAssetBorder::GetDefaultInsetsForStyle( |
1404 views::Button::STYLE_TEXTBUTTON); | 1407 views::Button::STYLE_TEXTBUTTON); |
1405 auth_error_email_button_->SetBorder(views::Border::CreateEmptyBorder( | 1408 auth_error_email_button_->SetBorder(views::Border::CreateEmptyBorder( |
1406 insets.top(), insets.left(), insets.bottom(), insets.right())); | 1409 insets.top(), insets.left(), insets.bottom(), insets.right())); |
1407 layout->AddView(auth_error_email_button_); | 1410 layout->AddView(auth_error_email_button_); |
1408 } else { | 1411 } else { |
1409 // Add a small padding between the email button and the profile name. | 1412 // Add a small padding between the email button and the profile name. |
1410 layout->StartRowWithPadding(1, 0, 0, 2); | 1413 layout->StartRowWithPadding(1, 0, 0, 2); |
1411 views::Label* email_label = new views::Label(avatar_item.username); | 1414 views::Label* email_label = new views::Label(avatar_item.username); |
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1880 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) != | 1883 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) != |
1881 IncognitoModePrefs::DISABLED; | 1884 IncognitoModePrefs::DISABLED; |
1882 return incognito_available && !browser_->profile()->IsGuestSession(); | 1885 return incognito_available && !browser_->profile()->IsGuestSession(); |
1883 } | 1886 } |
1884 | 1887 |
1885 void ProfileChooserView::PostActionPerformed( | 1888 void ProfileChooserView::PostActionPerformed( |
1886 ProfileMetrics::ProfileDesktopMenu action_performed) { | 1889 ProfileMetrics::ProfileDesktopMenu action_performed) { |
1887 ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_); | 1890 ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_); |
1888 gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE; | 1891 gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE; |
1889 } | 1892 } |
OLD | NEW |