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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 4524002: First cut of the about:conflicts page, listing all DLLs loaded in the Chrome ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 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 | « chrome/app/google_chrome_strings.grd ('k') | chrome/browser/about_flags.cc » ('j') | chrome/browser/enumerate_modules_model_win.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/theme/theme_resources.grd
===================================================================
--- chrome/app/theme/theme_resources.grd (revision 65039)
+++ chrome/app/theme/theme_resources.grd (working copy)
@@ -76,6 +76,9 @@
<include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA" />
<include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" />
<include name="IDR_CLOSE_BUTTON_MASK" file="close_button_mask.png" type="BINDATA" />
+ <if expr="os.find('win') != -1">
+ <include name="IDR_CONFLICTS" file="conflicts.png" type="BINDATA" />
+ </if>
<include name="IDR_CONSTRAINED_BOTTOM_CENTER_V" file="constrained_bottom_center_v.png" type="BINDATA" />
<include name="IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V" file="constrained_bottom_left_corner_v.png" type="BINDATA" />
<include name="IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V" file="constrained_bottom_right_corner_v.png" type="BINDATA" />
@@ -169,6 +172,10 @@
<include name="IDR_HOME" file="home.png" type="BINDATA" />
<include name="IDR_HOME_H" file="home_h.png" type="BINDATA" />
<include name="IDR_HOME_P" file="home_p.png" type="BINDATA" />
+ <if expr="os.find('win') != -1">
+ <include name="IDR_INCOMPATIBILITY_DOT_ACTIVE" file="incompatibility_dot_active.png" type="BINDATA" />
+ <include name="IDR_INCOMPATIBILITY_DOT_INACTIVE" file="incompatibility_dot_inactive.png" type="BINDATA" />
+ </if>
<include name="IDR_INFOBAR_ALT_NAV_URL" file="infobar_didyoumean.png" type="BINDATA" />
<include name="IDR_INFOBAR_AUTOFILL" file="infobar_autofill.png" type="BINDATA" />
<include name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="infobar_multiple_downloads.png" type="BINDATA" />
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | chrome/browser/about_flags.cc » ('j') | chrome/browser/enumerate_modules_model_win.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698