OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" | 5 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" |
6 | 6 |
7 #include "base/sys_string_conversions.h" | 7 #include "base/sys_string_conversions.h" |
8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/command_updater.h" | 10 #include "chrome/browser/command_updater.h" |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
126 [cell accessibilitySetOverrideValue: | 126 [cell accessibilitySetOverrideValue: |
127 l10n_util::GetNSString(IDS_PROFILES_BUBBLE_ACCESSIBLE_DESCRIPTION) | 127 l10n_util::GetNSString(IDS_PROFILES_BUBBLE_ACCESSIBLE_DESCRIPTION) |
128 forAttribute:NSAccessibilityHelpAttribute]; | 128 forAttribute:NSAccessibilityHelpAttribute]; |
129 [cell accessibilitySetOverrideValue: | 129 [cell accessibilitySetOverrideValue: |
130 l10n_util::GetNSString(IDS_PROFILES_BUBBLE_ACCESSIBLE_DESCRIPTION) | 130 l10n_util::GetNSString(IDS_PROFILES_BUBBLE_ACCESSIBLE_DESCRIPTION) |
131 forAttribute:NSAccessibilityDescriptionAttribute]; | 131 forAttribute:NSAccessibilityDescriptionAttribute]; |
132 | 132 |
133 [self setView:button]; | 133 [self setView:button]; |
134 | 134 |
135 if (browser_->profile()->IsOffTheRecord()) { | 135 if (browser_->profile()->IsOffTheRecord()) { |
136 [self setImage:[self compositeImageWithShadow: | 136 gfx::Image otrIcon = |
137 gfx::GetCachedImageWithName(@"otr_icon.pdf")]]; | 137 ResourceBundle::GetSharedInstance().GetNativeImageNamed(IDR_OTR_ICON); |
138 [self setImage:[self compositeImageWithShadow:otrIcon]]; | |
Robert Sesek
2012/09/13 13:17:55
Use .ToNSImage(). The operator is deprecated.
Nico
2012/09/14 02:08:39
Done.
| |
138 [self setButtonEnabled:NO]; | 139 [self setButtonEnabled:NO]; |
139 } else { | 140 } else { |
140 [self setButtonEnabled:YES]; | 141 [self setButtonEnabled:YES]; |
141 observer_.reset(new AvatarButtonControllerInternal::Observer(self)); | 142 observer_.reset(new AvatarButtonControllerInternal::Observer(self)); |
142 [self updateAvatar]; | 143 [self updateAvatar]; |
143 } | 144 } |
144 } | 145 } |
145 return self; | 146 return self; |
146 } | 147 } |
147 | 148 |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
305 [themeFrame _tileTitlebarAndRedisplay:YES]; | 306 [themeFrame _tileTitlebarAndRedisplay:YES]; |
306 } | 307 } |
307 | 308 |
308 // Testing ///////////////////////////////////////////////////////////////////// | 309 // Testing ///////////////////////////////////////////////////////////////////// |
309 | 310 |
310 - (AvatarMenuBubbleController*)menuController { | 311 - (AvatarMenuBubbleController*)menuController { |
311 return menuController_; | 312 return menuController_; |
312 } | 313 } |
313 | 314 |
314 @end | 315 @end |
OLD | NEW |