| 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/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/first_run/first_run.h" | 10 #include "chrome/browser/first_run/first_run.h" |
| (...skipping 1397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1408 | 1408 |
| 1409 if (!tutorial_shown) { | 1409 if (!tutorial_shown) { |
| 1410 if (show_count == kUpgradeWelcomeTutorialShowMax) | 1410 if (show_count == kUpgradeWelcomeTutorialShowMax) |
| 1411 return NULL; | 1411 return NULL; |
| 1412 profile->GetPrefs()->SetInteger( | 1412 profile->GetPrefs()->SetInteger( |
| 1413 prefs::kProfileAvatarTutorialShown, show_count + 1); | 1413 prefs::kProfileAvatarTutorialShown, show_count + 1); |
| 1414 } | 1414 } |
| 1415 | 1415 |
| 1416 return CreateTutorialView( | 1416 return CreateTutorialView( |
| 1417 profiles::TUTORIAL_MODE_WELCOME_UPGRADE, | 1417 profiles::TUTORIAL_MODE_WELCOME_UPGRADE, |
| 1418 l10n_util::GetStringFUTF16( | 1418 l10n_util::GetStringUTF16( |
| 1419 IDS_PROFILES_WELCOME_UPGRADE_TUTORIAL_TITLE, avatar_item.name), | 1419 IDS_PROFILES_WELCOME_UPGRADE_TUTORIAL_TITLE), |
| 1420 l10n_util::GetStringUTF16( | 1420 l10n_util::GetStringUTF16( |
| 1421 IDS_PROFILES_WELCOME_UPGRADE_TUTORIAL_CONTENT_TEXT), | 1421 IDS_PROFILES_WELCOME_UPGRADE_TUTORIAL_CONTENT_TEXT), |
| 1422 l10n_util::GetStringFUTF16( | 1422 l10n_util::GetStringFUTF16( |
| 1423 IDS_PROFILES_NOT_YOU, avatar_item.name), | 1423 IDS_PROFILES_NOT_YOU, avatar_item.name), |
| 1424 l10n_util::GetStringUTF16(IDS_PROFILES_TUTORIAL_WHATS_NEW_BUTTON), | 1424 l10n_util::GetStringUTF16(IDS_PROFILES_TUTORIAL_WHATS_NEW_BUTTON), |
| 1425 &tutorial_not_you_link_, | 1425 &tutorial_not_you_link_, |
| 1426 &tutorial_see_whats_new_button_); | 1426 &tutorial_see_whats_new_button_); |
| 1427 } | 1427 } |
| 1428 | 1428 |
| 1429 views::View* ProfileChooserView::CreateSigninConfirmationView(){ | 1429 views::View* ProfileChooserView::CreateSigninConfirmationView(){ |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1498 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) != | 1498 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) != |
| 1499 IncognitoModePrefs::DISABLED; | 1499 IncognitoModePrefs::DISABLED; |
| 1500 return incognito_available && !browser_->profile()->IsGuestSession(); | 1500 return incognito_available && !browser_->profile()->IsGuestSession(); |
| 1501 } | 1501 } |
| 1502 | 1502 |
| 1503 void ProfileChooserView::PostActionPerformed( | 1503 void ProfileChooserView::PostActionPerformed( |
| 1504 ProfileMetrics::ProfileDesktopMenu action_performed) { | 1504 ProfileMetrics::ProfileDesktopMenu action_performed) { |
| 1505 ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_); | 1505 ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_); |
| 1506 gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE; | 1506 gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE; |
| 1507 } | 1507 } |
| OLD | NEW |