Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(473)

Side by Side Diff: chrome/browser/ui/views/profile_chooser_view.cc

Issue 212603011: Newly created profiles should have the grey silhouette as avatar. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove duplicate references to resource for grey avatar. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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.h" 17 #include "chrome/browser/signin/signin_manager.h"
17 #include "chrome/browser/signin/signin_manager_factory.h" 18 #include "chrome/browser/signin/signin_manager_factory.h"
18 #include "chrome/browser/signin/signin_promo.h" 19 #include "chrome/browser/signin/signin_promo.h"
19 #include "chrome/browser/ui/browser.h" 20 #include "chrome/browser/ui/browser.h"
20 #include "chrome/browser/ui/browser_dialogs.h" 21 #include "chrome/browser/ui/browser_dialogs.h"
(...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after
846 layout->StartRow(1, 0); 847 layout->StartRow(1, 0);
847 layout->SkipColumns(1); 848 layout->SkipColumns(1);
848 849
849 layout->StartRow(1, 0); 850 layout->StartRow(1, 0);
850 layout->SkipColumns(1); 851 layout->SkipColumns(1);
851 return view; 852 return view;
852 } 853 }
853 854
854 views::View* ProfileChooserView::CreateGuestProfileView() { 855 views::View* ProfileChooserView::CreateGuestProfileView() {
855 gfx::Image guest_icon = 856 gfx::Image guest_icon =
856 ui::ResourceBundle::GetSharedInstance().GetImageNamed(IDR_LOGIN_GUEST); 857 ui::ResourceBundle::GetSharedInstance().GetImageNamed(
858 ProfileInfoCache::GetPlaceholderAvatarIconResourceID());
noms (inactive) 2014/03/27 20:19:32 nit: indent by 2 more
Mike Lerman 2014/04/02 17:46:25 Done.
857 AvatarMenu::Item guest_avatar_item(0, 0, guest_icon); 859 AvatarMenu::Item guest_avatar_item(0, 0, guest_icon);
858 guest_avatar_item.active = true; 860 guest_avatar_item.active = true;
859 guest_avatar_item.name = l10n_util::GetStringUTF16( 861 guest_avatar_item.name = l10n_util::GetStringUTF16(
860 IDS_PROFILES_GUEST_PROFILE_NAME); 862 IDS_PROFILES_GUEST_PROFILE_NAME);
861 guest_avatar_item.signed_in = false; 863 guest_avatar_item.signed_in = false;
862 864
863 return CreateCurrentProfileView(guest_avatar_item, true); 865 return CreateCurrentProfileView(guest_avatar_item, true);
864 } 866 }
865 867
866 views::View* ProfileChooserView::CreateOtherProfilesView( 868 views::View* ProfileChooserView::CreateOtherProfilesView(
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
1091 gfx::ALIGN_CENTER); 1093 gfx::ALIGN_CENTER);
1092 layout->StartRowWithPadding( 1094 layout->StartRowWithPadding(
1093 1, 0, 0, views::kUnrelatedControlVerticalSpacing); 1095 1, 0, 0, views::kUnrelatedControlVerticalSpacing);
1094 layout->AddView(remove_account_and_relaunch_button_); 1096 layout->AddView(remove_account_and_relaunch_button_);
1095 } else { 1097 } else {
1096 layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing); 1098 layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
1097 } 1099 }
1098 1100
1099 return view; 1101 return view;
1100 } 1102 }
OLDNEW
« chrome/browser/profiles/profile_window.cc ('K') | « chrome/browser/ui/views/frame/browser_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698