| 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 1651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1662 | 1662 |
| 1663 // Save the original email address, as the button text could be elided. | 1663 // Save the original email address, as the button text could be elided. |
| 1664 delete_account_button_map_[delete_button] = account_id; | 1664 delete_account_button_map_[delete_button] = account_id; |
| 1665 } | 1665 } |
| 1666 } | 1666 } |
| 1667 | 1667 |
| 1668 views::View* ProfileChooserView::CreateGaiaSigninView( | 1668 views::View* ProfileChooserView::CreateGaiaSigninView( |
| 1669 views::View** signin_content_view) { | 1669 views::View** signin_content_view) { |
| 1670 views::WebView* web_view = | 1670 views::WebView* web_view = |
| 1671 SigninViewControllerDelegateViews::CreateGaiaWebView( | 1671 SigninViewControllerDelegateViews::CreateGaiaWebView( |
| 1672 this, view_mode_, browser_->profile(), access_point_); | 1672 this, view_mode_, browser_, access_point_); |
| 1673 | 1673 |
| 1674 int message_id; | 1674 int message_id; |
| 1675 switch (view_mode_) { | 1675 switch (view_mode_) { |
| 1676 case profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN: | 1676 case profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN: |
| 1677 message_id = IDS_PROFILES_GAIA_SIGNIN_TITLE; | 1677 message_id = IDS_PROFILES_GAIA_SIGNIN_TITLE; |
| 1678 break; | 1678 break; |
| 1679 case profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT: | 1679 case profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT: |
| 1680 message_id = IDS_PROFILES_GAIA_ADD_ACCOUNT_TITLE; | 1680 message_id = IDS_PROFILES_GAIA_ADD_ACCOUNT_TITLE; |
| 1681 break; | 1681 break; |
| 1682 case profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH: { | 1682 case profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH: { |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1894 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) != | 1894 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) != |
| 1895 IncognitoModePrefs::DISABLED; | 1895 IncognitoModePrefs::DISABLED; |
| 1896 return incognito_available && !browser_->profile()->IsGuestSession(); | 1896 return incognito_available && !browser_->profile()->IsGuestSession(); |
| 1897 } | 1897 } |
| 1898 | 1898 |
| 1899 void ProfileChooserView::PostActionPerformed( | 1899 void ProfileChooserView::PostActionPerformed( |
| 1900 ProfileMetrics::ProfileDesktopMenu action_performed) { | 1900 ProfileMetrics::ProfileDesktopMenu action_performed) { |
| 1901 ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_); | 1901 ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_); |
| 1902 gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE; | 1902 gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE; |
| 1903 } | 1903 } |
| OLD | NEW |