| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/profile_chooser_view.h" | 5 #include "chrome/browser/ui/views/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/lifetime/application_lifetime.h" | 10 #include "chrome/browser/lifetime/application_lifetime.h" |
| 11 #include "chrome/browser/profiles/profile_info_cache.h" |
| 11 #include "chrome/browser/profiles/profile_info_util.h" | 12 #include "chrome/browser/profiles/profile_info_util.h" |
| 12 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
| 13 #include "chrome/browser/profiles/profile_window.h" | 14 #include "chrome/browser/profiles/profile_window.h" |
| 14 #include "chrome/browser/profiles/profiles_state.h" | 15 #include "chrome/browser/profiles/profiles_state.h" |
| 15 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 16 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
| 16 #include "chrome/browser/signin/signin_manager_factory.h" | 17 #include "chrome/browser/signin/signin_manager_factory.h" |
| 17 #include "chrome/browser/signin/signin_promo.h" | 18 #include "chrome/browser/signin/signin_promo.h" |
| 18 #include "chrome/browser/ui/browser.h" | 19 #include "chrome/browser/ui/browser.h" |
| 19 #include "chrome/browser/ui/browser_dialogs.h" | 20 #include "chrome/browser/ui/browser_dialogs.h" |
| 20 #include "chrome/browser/ui/singleton_tabs.h" | 21 #include "chrome/browser/ui/singleton_tabs.h" |
| (...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 849 layout->StartRow(1, 0); | 850 layout->StartRow(1, 0); |
| 850 layout->SkipColumns(1); | 851 layout->SkipColumns(1); |
| 851 | 852 |
| 852 layout->StartRow(1, 0); | 853 layout->StartRow(1, 0); |
| 853 layout->SkipColumns(1); | 854 layout->SkipColumns(1); |
| 854 return view; | 855 return view; |
| 855 } | 856 } |
| 856 | 857 |
| 857 views::View* ProfileChooserView::CreateGuestProfileView() { | 858 views::View* ProfileChooserView::CreateGuestProfileView() { |
| 858 gfx::Image guest_icon = | 859 gfx::Image guest_icon = |
| 859 ui::ResourceBundle::GetSharedInstance().GetImageNamed(IDR_LOGIN_GUEST); | 860 ui::ResourceBundle::GetSharedInstance().GetImageNamed( |
| 861 ProfileInfoCache::GetPlaceholderAvatarIconResourceID()); |
| 860 AvatarMenu::Item guest_avatar_item(0, 0, guest_icon); | 862 AvatarMenu::Item guest_avatar_item(0, 0, guest_icon); |
| 861 guest_avatar_item.active = true; | 863 guest_avatar_item.active = true; |
| 862 guest_avatar_item.name = l10n_util::GetStringUTF16( | 864 guest_avatar_item.name = l10n_util::GetStringUTF16( |
| 863 IDS_PROFILES_GUEST_PROFILE_NAME); | 865 IDS_PROFILES_GUEST_PROFILE_NAME); |
| 864 guest_avatar_item.signed_in = false; | 866 guest_avatar_item.signed_in = false; |
| 865 | 867 |
| 866 return CreateCurrentProfileView(guest_avatar_item, true); | 868 return CreateCurrentProfileView(guest_avatar_item, true); |
| 867 } | 869 } |
| 868 | 870 |
| 869 views::View* ProfileChooserView::CreateOtherProfilesView( | 871 views::View* ProfileChooserView::CreateOtherProfilesView( |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1102 gfx::ALIGN_CENTER); | 1104 gfx::ALIGN_CENTER); |
| 1103 layout->StartRowWithPadding( | 1105 layout->StartRowWithPadding( |
| 1104 1, 0, 0, views::kUnrelatedControlVerticalSpacing); | 1106 1, 0, 0, views::kUnrelatedControlVerticalSpacing); |
| 1105 layout->AddView(remove_account_and_relaunch_button_); | 1107 layout->AddView(remove_account_and_relaunch_button_); |
| 1106 } else { | 1108 } else { |
| 1107 layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing); | 1109 layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing); |
| 1108 } | 1110 } |
| 1109 | 1111 |
| 1110 return view; | 1112 return view; |
| 1111 } | 1113 } |
| OLD | NEW |