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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/theme/chrome_unscaled_resources.grd

Issue 1420163003: Fixed Windows system tray icon. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@profile-icon-imagefamily
Patch Set: Remove IDR_STATUS_TRAY_ICON on Win, and update tests to account for this. Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/background/background_mode_manager.cc » ('j') | chrome/browser/background/background_mode_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/theme/chrome_unscaled_resources.grd
diff --git a/chrome/app/theme/chrome_unscaled_resources.grd b/chrome/app/theme/chrome_unscaled_resources.grd
index 50b3b6833e958bfbc2a9fc30b19f1a61508a4be8..dc26321b5626bc04927de68fded9987d7f2763cb 100644
--- a/chrome/app/theme/chrome_unscaled_resources.grd
+++ b/chrome/app/theme/chrome_unscaled_resources.grd
@@ -23,7 +23,7 @@
<if expr="is_macosx">
<include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_22_mono.png" type="BINDATA" />
</if>
- <if expr="not is_macosx">
+ <if expr="not is_macosx and not is_win">
<include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_22.png" type="BINDATA" />
</if>
</if>
@@ -36,7 +36,7 @@
<if expr="is_macosx">
<include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22_mono.png" type="BINDATA" />
</if>
- <if expr="not is_macosx">
+ <if expr="not is_macosx and not is_win">
<include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.png" type="BINDATA" />
</if>
</if>
« no previous file with comments | « no previous file | chrome/browser/background/background_mode_manager.cc » ('j') | chrome/browser/background/background_mode_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698