diff options
| author | mgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-21 11:27:33 +0000 |
|---|---|---|
| committer | mgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-21 11:27:33 +0000 |
| commit | 2baad60408b5450827bb642ae80f1df1a13e3a30 (patch) | |
| tree | 25148c2f4f2dab68b93d221c5ae8c3328fefb1fd /chrome/app | |
| parent | 7937d2402fe4876530ab057601dbbaabd5f17124 (diff) | |
| download | chromium_src-2baad60408b5450827bb642ae80f1df1a13e3a30.zip chromium_src-2baad60408b5450827bb642ae80f1df1a13e3a30.tar.gz chromium_src-2baad60408b5450827bb642ae80f1df1a13e3a30.tar.bz2 | |
Update references to Mac- and Win-specific icon files in official build.
In the internal repository, several Mac- and Windows-specific icon files
have been moved into 'mac' and 'win' subdirectories in
chrome/app/theme/google_chrome. This updates the references to those
icons to refer to their new location.
BUG=333751
Review URL: https://codereview.chromium.org/138553005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_dll.rc | 4 | ||||
| -rw-r--r-- | chrome/app/chrome_exe.rc | 14 | ||||
| -rw-r--r-- | chrome/app/theme/chrome_unscaled_resources.grd | 16 |
3 files changed, 17 insertions, 17 deletions
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc index 797e5b8..8537801 100644 --- a/chrome/app/chrome_dll.rc +++ b/chrome/app/chrome_dll.rc @@ -162,8 +162,8 @@ END // future to get the icon from the .exe, which would save a copy. #if defined(GOOGLE_CHROME_BUILD) -IDR_MAINFRAME ICON "theme\google_chrome\chrome.ico" -IDR_SXS ICON "theme\google_chrome\chrome_sxs.ico" +IDR_MAINFRAME ICON "theme\google_chrome\win\chrome.ico" +IDR_SXS ICON "theme\google_chrome\win\chrome_sxs.ico" #else IDR_MAINFRAME ICON "theme\chromium\win\chromium.ico" #endif diff --git a/chrome/app/chrome_exe.rc b/chrome/app/chrome_exe.rc index 9183541..137d022 100644 --- a/chrome/app/chrome_exe.rc +++ b/chrome/app/chrome_exe.rc @@ -36,13 +36,13 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // icons. To avoid breaking existing shortcuts, add new icons at the end // (following the ordering described above). #if defined(GOOGLE_CHROME_BUILD) -IDR_MAINFRAME ICON "theme\google_chrome\chrome.ico" -IDR_MAINFRAME_2 ICON "theme\google_chrome\chrome2.ico" -IDR_MAINFRAME_3 ICON "theme\google_chrome\chrome3.ico" -IDR_MAINFRAME_4 ICON "theme\google_chrome\chrome4.ico" +IDR_MAINFRAME ICON "theme\google_chrome\win\chrome.ico" +IDR_MAINFRAME_2 ICON "theme\google_chrome\win\chrome2.ico" +IDR_MAINFRAME_3 ICON "theme\google_chrome\win\chrome3.ico" +IDR_MAINFRAME_4 ICON "theme\google_chrome\win\chrome4.ico" // The SXS icon must have an index of 4, the constant is used in Chrome code to // identify it. -IDR_SXS ICON "theme\google_chrome\chrome_sxs.ico" +IDR_SXS ICON "theme\google_chrome\win\chrome_sxs.ico" #else IDR_MAINFRAME ICON "theme\chromium\win\chromium.ico" #endif @@ -51,8 +51,8 @@ IDR_MAINFRAME ICON "theme\chromium\win\chromium.ico // alphabetically after IDR_SXS. #if defined(GOOGLE_CHROME_BUILD) // The App Launcher icon must have an index of 5 in Chrome, and 6 for SXS. -IDR_X_APP_LIST ICON "theme\\google_chrome\\app_list.ico" -IDR_X_APP_LIST_SXS ICON "theme\\google_chrome\\app_list_sxs.ico" +IDR_X_APP_LIST ICON "theme\\google_chrome\\win\\app_list.ico" +IDR_X_APP_LIST_SXS ICON "theme\\google_chrome\\win\\app_list_sxs.ico" #else // The App Launcher icon must have an index of 1 for Chromium. IDR_X_APP_LIST ICON "theme\\chromium\\win\\app_list.ico" diff --git a/chrome/app/theme/chrome_unscaled_resources.grd b/chrome/app/theme/chrome_unscaled_resources.grd index 00e44f5..40db164 100644 --- a/chrome/app/theme/chrome_unscaled_resources.grd +++ b/chrome/app/theme/chrome_unscaled_resources.grd @@ -80,14 +80,14 @@ <!-- App Launcher icons for .app shim, dock icon. Unscaled, because the icon file built does not depend on UI scale factor. --> <if expr="pp_ifdef('_google_chrome')"> - <include name="IDR_APP_LIST_16" file="google_chrome/app_list_16.png" type="BINDATA" /> - <include name="IDR_APP_LIST_32" file="google_chrome/app_list_32.png" type="BINDATA" /> - <include name="IDR_APP_LIST_128" file="google_chrome/app_list_128.png" type="BINDATA" /> - <include name="IDR_APP_LIST_256" file="google_chrome/app_list_256.png" type="BINDATA" /> - <include name="IDR_APP_LIST_CANARY_16" file="google_chrome/app_list_canary_16.png" type="BINDATA" /> - <include name="IDR_APP_LIST_CANARY_32" file="google_chrome/app_list_canary_32.png" type="BINDATA" /> - <include name="IDR_APP_LIST_CANARY_128" file="google_chrome/app_list_canary_128.png" type="BINDATA" /> - <include name="IDR_APP_LIST_CANARY_256" file="google_chrome/app_list_canary_256.png" type="BINDATA" /> + <include name="IDR_APP_LIST_16" file="google_chrome/mac/app_list_16.png" type="BINDATA" /> + <include name="IDR_APP_LIST_32" file="google_chrome/mac/app_list_32.png" type="BINDATA" /> + <include name="IDR_APP_LIST_128" file="google_chrome/mac/app_list_128.png" type="BINDATA" /> + <include name="IDR_APP_LIST_256" file="google_chrome/mac/app_list_256.png" type="BINDATA" /> + <include name="IDR_APP_LIST_CANARY_16" file="google_chrome/mac/app_list_canary_16.png" type="BINDATA" /> + <include name="IDR_APP_LIST_CANARY_32" file="google_chrome/mac/app_list_canary_32.png" type="BINDATA" /> + <include name="IDR_APP_LIST_CANARY_128" file="google_chrome/mac/app_list_canary_128.png" type="BINDATA" /> + <include name="IDR_APP_LIST_CANARY_256" file="google_chrome/mac/app_list_canary_256.png" type="BINDATA" /> </if> <if expr="not pp_ifdef('_google_chrome')"> <include name="IDR_APP_LIST_16" file="chromium/mac/app_list_16.png" type="BINDATA" /> |