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

Side by Side Diff: chrome/app/theme/theme_resources.grd

Issue 8508051: Revert 109285 - Seems to have broken chrome_frame_net_tests on the win_rel trybot, stuffing up th... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/extension_function_dispatcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/theme_resources.h" type="rc_header"> 4 <output filename="grit/theme_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="grit/theme_resources_map.cc" type="resource_map_source" /> 7 <output filename="grit/theme_resources_map.cc" type="resource_map_source" />
8 <output filename="grit/theme_resources_map.h" type="resource_map_header" /> 8 <output filename="grit/theme_resources_map.h" type="resource_map_header" />
9 <output filename="theme_resources.pak" type="data_package" /> 9 <output filename="theme_resources.pak" type="data_package" />
10 <output filename="theme_resources.rc" type="rc_all" /> 10 <output filename="theme_resources.rc" type="rc_all" />
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 <include name="IDR_SEARCH_ENGINE_LOGO_YAHOOQC" file="notused.png" type=" BINDATA" /> 335 <include name="IDR_SEARCH_ENGINE_LOGO_YAHOOQC" file="notused.png" type=" BINDATA" />
336 <include name="IDR_SEARCH_ENGINE_LOGO_YANDEX" file="notused.png" type="B INDATA" /> 336 <include name="IDR_SEARCH_ENGINE_LOGO_YANDEX" file="notused.png" type="B INDATA" />
337 <include name="IDR_SEARCH_ENGINE_LOGO_ZOZNAM" file="notused.png" type="B INDATA" /> 337 <include name="IDR_SEARCH_ENGINE_LOGO_ZOZNAM" file="notused.png" type="B INDATA" />
338 </if> 338 </if>
339 <include name="IDR_SIDETABS_NEW_TAB" file="sidetabs_new_tab.png" type="BIN DATA" /> 339 <include name="IDR_SIDETABS_NEW_TAB" file="sidetabs_new_tab.png" type="BIN DATA" />
340 <include name="IDR_SPEECH_INPUT_MIC_EMPTY" file="speech_input_mic_empty.pn g" type="BINDATA" /> 340 <include name="IDR_SPEECH_INPUT_MIC_EMPTY" file="speech_input_mic_empty.pn g" type="BINDATA" />
341 <include name="IDR_SPEECH_INPUT_MIC_NOISE" file="speech_input_mic_noise.pn g" type="BINDATA" /> 341 <include name="IDR_SPEECH_INPUT_MIC_NOISE" file="speech_input_mic_noise.pn g" type="BINDATA" />
342 <include name="IDR_SPEECH_INPUT_MIC_FULL" file="speech_input_mic_full.png" type="BINDATA" /> 342 <include name="IDR_SPEECH_INPUT_MIC_FULL" file="speech_input_mic_full.png" type="BINDATA" />
343 <include name="IDR_SPEECH_INPUT_MIC_MASK" file="speech_input_mic_mask.png" type="BINDATA" /> 343 <include name="IDR_SPEECH_INPUT_MIC_MASK" file="speech_input_mic_mask.png" type="BINDATA" />
344 <include name="IDR_SPEECH_INPUT_SPINNER" file="speech_input_spinner.png" t ype="BINDATA" /> 344 <include name="IDR_SPEECH_INPUT_SPINNER" file="speech_input_spinner.png" t ype="BINDATA" />
345 <include name="IDR_SPEECH_INPUT_TRAY_BALLOON_ICON" file="speech_input_tray _balloon_icon.png" type="BINDATA" />
346 <if expr="is_win">
347 <include name="IDR_SPEECH_INPUT_TRAY_MIC_EMPTY" file="speech_input_tray_ windows_mic_empty.png" type="BINDATA" />
348 <include name="IDR_SPEECH_INPUT_TRAY_MIC_FULL" file="speech_input_tray_w indows_mic_full.png" type="BINDATA" />
349 </if>
350 <if expr="is_linux or pp_ifdef('chromeos')">
351 <include name="IDR_SPEECH_INPUT_TRAY_MIC_EMPTY" file="speech_input_tray_ linux_mic_empty.png" type="BINDATA" />
352 <include name="IDR_SPEECH_INPUT_TRAY_MIC_FULL" file="speech_input_tray_l inux_mic_full.png" type="BINDATA" />
353 </if>
354 <if expr="is_macosx">
355 <include name="IDR_SPEECH_INPUT_TRAY_MIC_EMPTY" file="speech_input_tray_ macosx_mic_empty.png" type="BINDATA" />
356 <include name="IDR_SPEECH_INPUT_TRAY_MIC_FULL" file="speech_input_tray_m acosx_mic_full.png" type="BINDATA" />
357 </if>
358 <if expr="pp_ifdef('_google_chrome') and is_macosx"> 345 <if expr="pp_ifdef('_google_chrome') and is_macosx">
359 <include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_22 _mono.png" type="BINDATA" /> 346 <include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_22 _mono.png" type="BINDATA" />
360 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="google_chrome/product _logo_22_mono_invert.png" type="BINDATA" /> 347 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="google_chrome/product _logo_22_mono_invert.png" type="BINDATA" />
361 </if> 348 </if>
362 <if expr="not pp_ifdef('_google_chrome') and is_macosx"> 349 <if expr="not pp_ifdef('_google_chrome') and is_macosx">
363 <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22_mono .png" type="BINDATA" /> 350 <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22_mono .png" type="BINDATA" />
364 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_logo _22_mono_invert.png" type="BINDATA" /> 351 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_logo _22_mono_invert.png" type="BINDATA" />
365 </if> 352 </if>
366 <if expr="pp_ifdef('_google_chrome') and not is_macosx"> 353 <if expr="pp_ifdef('_google_chrome') and not is_macosx">
367 <include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_22 .png" type="BINDATA" /> 354 <include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_22 .png" type="BINDATA" />
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 <include name="IDR_USER_IMAGE_RECYCLE" file="discard_wide.png" type="BIN DATA" /> 543 <include name="IDR_USER_IMAGE_RECYCLE" file="discard_wide.png" type="BIN DATA" />
557 <include name="IDR_USER_IMAGE_CAPTURE_DISABLED" file="snapshot_wide_disa bled.png" type="BINDATA" /> 544 <include name="IDR_USER_IMAGE_CAPTURE_DISABLED" file="snapshot_wide_disa bled.png" type="BINDATA" />
558 <include name="IDR_USER_IMAGE_INITIALIZING" file="initializing_video.png " type="BINDATA" /> 545 <include name="IDR_USER_IMAGE_INITIALIZING" file="initializing_video.png " type="BINDATA" />
559 <include name="IDR_VOLUME_BUBBLE_UP_ICON" file="volume_up_icon.png" type ="BINDATA" /> 546 <include name="IDR_VOLUME_BUBBLE_UP_ICON" file="volume_up_icon.png" type ="BINDATA" />
560 <include name="IDR_VOLUME_BUBBLE_DOWN_ICON" file="volume_down_icon.png" type="BINDATA" /> 547 <include name="IDR_VOLUME_BUBBLE_DOWN_ICON" file="volume_down_icon.png" type="BINDATA" />
561 <include name="IDR_VOLUME_BUBBLE_MUTE_ICON" file="volume_mute_icon.png" type="BINDATA" /> 548 <include name="IDR_VOLUME_BUBBLE_MUTE_ICON" file="volume_mute_icon.png" type="BINDATA" />
562 </if> 549 </if>
563 </includes> 550 </includes>
564 </release> 551 </release>
565 </grit> 552 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/extension_function_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698