| 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 #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 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1209 } | 1209 } |
| 1210 | 1210 |
| 1211 [container addSubview:link]; | 1211 [container addSubview:link]; |
| 1212 [container setFrameSize:rect.size]; | 1212 [container setFrameSize:rect.size]; |
| 1213 return container.autorelease(); | 1213 return container.autorelease(); |
| 1214 } | 1214 } |
| 1215 | 1215 |
| 1216 - (NSView*)createGuestProfileView { | 1216 - (NSView*)createGuestProfileView { |
| 1217 gfx::Image guestIcon = | 1217 gfx::Image guestIcon = |
| 1218 ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed( | 1218 ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed( |
| 1219 IDR_LOGIN_GUEST); | 1219 profiles::GetPlaceholderAvatarIconResourceID()); |
| 1220 AvatarMenu::Item guestItem(std::string::npos, /* menu_index, not used */ | 1220 AvatarMenu::Item guestItem(std::string::npos, /* menu_index, not used */ |
| 1221 std::string::npos, /* profile_index, not used */ | 1221 std::string::npos, /* profile_index, not used */ |
| 1222 guestIcon); | 1222 guestIcon); |
| 1223 guestItem.active = true; | 1223 guestItem.active = true; |
| 1224 guestItem.name = base::SysNSStringToUTF16( | 1224 guestItem.name = base::SysNSStringToUTF16( |
| 1225 l10n_util::GetNSString(IDS_PROFILES_GUEST_PROFILE_NAME)); | 1225 l10n_util::GetNSString(IDS_PROFILES_GUEST_PROFILE_NAME)); |
| 1226 | 1226 |
| 1227 return [self createCurrentProfileView:guestItem]; | 1227 return [self createCurrentProfileView:guestItem]; |
| 1228 } | 1228 } |
| 1229 | 1229 |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1536 [button setTitle:ElideEmail(title, rect.size.width)]; | 1536 [button setTitle:ElideEmail(title, rect.size.width)]; |
| 1537 [button setAlignment:NSLeftTextAlignment]; | 1537 [button setAlignment:NSLeftTextAlignment]; |
| 1538 [button setBordered:NO]; | 1538 [button setBordered:NO]; |
| 1539 [button setTarget:self]; | 1539 [button setTarget:self]; |
| 1540 [button setAction:@selector(showAccountRemovalView:)]; | 1540 [button setAction:@selector(showAccountRemovalView:)]; |
| 1541 | 1541 |
| 1542 return button.autorelease(); | 1542 return button.autorelease(); |
| 1543 } | 1543 } |
| 1544 | 1544 |
| 1545 @end | 1545 @end |
| OLD | NEW |