diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-14 03:07:39 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-14 03:07:39 +0000 |
| commit | c1d408717c9b72cdacbc981e467b866fe560181b (patch) | |
| tree | 4e0cd01710887995820b4e4d674c5ed2c283a518 | |
| parent | 21884f5055ebefa356582aa120757ea1d7e16756 (diff) | |
| download | chromium_src-c1d408717c9b72cdacbc981e467b866fe560181b.zip chromium_src-c1d408717c9b72cdacbc981e467b866fe560181b.tar.gz chromium_src-c1d408717c9b72cdacbc981e467b866fe560181b.tar.bz2 | |
mac: use png otr icon asset instead of pdf
BUG=111101
Review URL: https://codereview.chromium.org/10916283
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156727 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 5 | ||||
| -rw-r--r-- | chrome/browser/ui/cocoa/browser/avatar_button_controller.mm | 5 | ||||
| -rw-r--r-- | chrome/chrome_dll.gypi | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index a9fb049..4073eb5 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -520,7 +520,7 @@ <structure type="chrome_scaled_image" name="IDR_OOBE_PROGRESS_LINE_LEFT" file="oobe_progress_line_left.png" /> <structure type="chrome_scaled_image" name="IDR_OOBE_PROGRESS_LINE_RIGHT" file="oobe_progress_line_right.png" /> </if> - <if expr="not pp_ifdef('toolkit_views')"> + <if expr="not pp_ifdef('toolkit_views') and not is_macosx"> <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="otr_icon.png" /> </if> <if expr="pp_ifdef('toolkit_views')"> @@ -531,6 +531,9 @@ <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="cros/otr_icon.png" /> </if> </if> + <if expr="is_macosx"> + <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="mac/otr_icon.png" /> + </if> <if expr="context.startswith('default_')"> <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" file="otr_icon.png" /> </if> diff --git a/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm b/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm index 5b91b5a..3dc453a 100644 --- a/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm +++ b/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm @@ -132,8 +132,9 @@ const CGFloat kMenuYOffsetAdjust = 1.0; [self setView:button]; if (browser_->profile()->IsOffTheRecord()) { - [self setImage:[self compositeImageWithShadow: - gfx::GetCachedImageWithName(@"otr_icon.pdf")]]; + ResourceBundle& bundle = ResourceBundle::GetSharedInstance(); + NSImage* otrIcon = bundle.GetNativeImageNamed(IDR_OTR_ICON).ToNSImage(); + [self setImage:[self compositeImageWithShadow:otrIcon]]; [self setButtonEnabled:NO]; } else { [self setButtonEnabled:YES]; diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 139b982..a97e914 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -286,7 +286,6 @@ 'app/theme/menu_hierarchy_arrow.pdf', 'app/theme/menu_overflow_down.pdf', 'app/theme/menu_overflow_up.pdf', - 'app/theme/otr_icon.pdf', 'browser/mac/install.sh', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak', |