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

Side by Side Diff: trunk/src/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

Issue 234583008: Revert 263262 "Newly created profiles should have the grey silho..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h" 7 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
8 8
9 #include "base/mac/bundle_locations.h" 9 #include "base/mac/bundle_locations.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 1085 matching lines...) Expand 10 before | Expand all | Expand 10 after
1096 1096
1097 [container addSubview:link]; 1097 [container addSubview:link];
1098 [container setFrameSize:NSMakeSize( 1098 [container setFrameSize:NSMakeSize(
1099 NSMaxX([link frame]), NSMaxY([link frame]) + kSmallVerticalSpacing)]; 1099 NSMaxX([link frame]), NSMaxY([link frame]) + kSmallVerticalSpacing)];
1100 return container.autorelease(); 1100 return container.autorelease();
1101 } 1101 }
1102 1102
1103 - (NSView*)createGuestProfileView { 1103 - (NSView*)createGuestProfileView {
1104 gfx::Image guestIcon = 1104 gfx::Image guestIcon =
1105 ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed( 1105 ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
1106 profiles::GetPlaceholderAvatarIconResourceID()); 1106 IDR_LOGIN_GUEST);
1107 AvatarMenu::Item guestItem(std::string::npos, /* menu_index, not used */ 1107 AvatarMenu::Item guestItem(std::string::npos, /* menu_index, not used */
1108 std::string::npos, /* profile_index, not used */ 1108 std::string::npos, /* profile_index, not used */
1109 guestIcon); 1109 guestIcon);
1110 guestItem.active = true; 1110 guestItem.active = true;
1111 guestItem.name = base::SysNSStringToUTF16( 1111 guestItem.name = base::SysNSStringToUTF16(
1112 l10n_util::GetNSString(IDS_PROFILES_GUEST_PROFILE_NAME)); 1112 l10n_util::GetNSString(IDS_PROFILES_GUEST_PROFILE_NAME));
1113 1113
1114 return [self createCurrentProfileView:guestItem]; 1114 return [self createCurrentProfileView:guestItem];
1115 } 1115 }
1116 1116
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
1431 [button setImage:ui::ResourceBundle::GetSharedInstance(). 1431 [button setImage:ui::ResourceBundle::GetSharedInstance().
1432 GetNativeImageNamed(IDR_CLOSE_1).ToNSImage()]; 1432 GetNativeImageNamed(IDR_CLOSE_1).ToNSImage()];
1433 [button setImagePosition:NSImageRight]; 1433 [button setImagePosition:NSImageRight];
1434 [button setTarget:self]; 1434 [button setTarget:self];
1435 [button setAction:@selector(showAccountRemovalView:)]; 1435 [button setAction:@selector(showAccountRemovalView:)];
1436 1436
1437 return button.autorelease(); 1437 return button.autorelease();
1438 } 1438 }
1439 1439
1440 @end 1440 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698