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
cbchan · Sep 14, 2012 · c1d4087 · c1d4087
1 parent 21884f5
commit c1d4087
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -132,8 +132,9 @@ - (id)initWithBrowser:(Browser*)browser {
     [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
@@ -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',