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

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

Issue 661454: Initial implementation of status tray functionality (mac-only, currently). (Closed)
Patch Set: more changes per review feedback Created 10 years, 9 months 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
« no previous file with comments | « no previous file | chrome/browser/browser.h » ('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="theme_resources.rc" type="rc_all" /> 7 <output filename="theme_resources.rc" type="rc_all" />
8 <output filename="theme_resources.pak" type="data_package" /> 8 <output filename="theme_resources.pak" type="data_package" />
9 <output filename="grit/theme_resources_map.h" type="resource_map_header" /> 9 <output filename="grit/theme_resources_map.h" type="resource_map_header" />
10 <output filename="grit/theme_resources_map.cc" type="resource_map_source" /> 10 <output filename="grit/theme_resources_map.cc" type="resource_map_source" />
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 <include name="IDR_ABOUT_BACKGROUND_COLOR" file="google_chrome/about_bac kground_color.png" type="BINDATA" /> 330 <include name="IDR_ABOUT_BACKGROUND_COLOR" file="google_chrome/about_bac kground_color.png" type="BINDATA" />
331 <include name="IDR_DISTRIBUTOR_LOGO" file="google_chrome/distributor_log o.png" type="BINDATA" /> 331 <include name="IDR_DISTRIBUTOR_LOGO" file="google_chrome/distributor_log o.png" type="BINDATA" />
332 <include name="IDR_DISTRIBUTOR_LOGO_LIGHT" file="google_chrome/distribut or_logo_light.png" type="BINDATA" /> 332 <include name="IDR_DISTRIBUTOR_LOGO_LIGHT" file="google_chrome/distribut or_logo_light.png" type="BINDATA" />
333 <include name="IDR_PRODUCT_LOGO" file="google_chrome/product_logo.png" t ype="BINDATA" /> 333 <include name="IDR_PRODUCT_LOGO" file="google_chrome/product_logo.png" t ype="BINDATA" />
334 <include name="IDR_PRODUCT_LOGO_WHITE" file="google_chrome/product_logo_ white.png" type="BINDATA" /> 334 <include name="IDR_PRODUCT_LOGO_WHITE" file="google_chrome/product_logo_ white.png" type="BINDATA" />
335 <include name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16. png" type="BINDATA" /> 335 <include name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16. png" type="BINDATA" />
336 <include name="IDR_WIZARD_ICON" file="google_chrome/wizard_icon.png" typ e="BINDATA" /> 336 <include name="IDR_WIZARD_ICON" file="google_chrome/wizard_icon.png" typ e="BINDATA" />
337 <include name="IDR_WIZARD_ICON_RTL" file="google_chrome/wizard_icon_rtl. png" type="BINDATA" /> 337 <include name="IDR_WIZARD_ICON_RTL" file="google_chrome/wizard_icon_rtl. png" type="BINDATA" />
338 <include name="IDR_PRODUCT_ICON_32" file="google_chrome/google_chrome_ic on_32.png" type="BINDATA" /> 338 <include name="IDR_PRODUCT_ICON_32" file="google_chrome/google_chrome_ic on_32.png" type="BINDATA" />
339 <include name="IDR_INFOBAR_TRANSLATE" file="google_chrome/infobar_transl ate.png" type="BINDATA" /> 339 <include name="IDR_INFOBAR_TRANSLATE" file="google_chrome/infobar_transl ate.png" type="BINDATA" />
340 <include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_22 .png" type="BINDATA" />
340 </if> 341 </if>
341 342
342 <if expr="not pp_ifdef('_google_chrome')"> 343 <if expr="not pp_ifdef('_google_chrome')">
343 <include name="IDR_ABOUT_BACKGROUND" file="chromium/about_background.png " type="BINDATA" /> 344 <include name="IDR_ABOUT_BACKGROUND" file="chromium/about_background.png " type="BINDATA" />
344 <include name="IDR_ABOUT_BACKGROUND_RTL" file="chromium/about_background _rtl.png" type="BINDATA" /> 345 <include name="IDR_ABOUT_BACKGROUND_RTL" file="chromium/about_background _rtl.png" type="BINDATA" />
345 <include name="IDR_ABOUT_BACKGROUND_COLOR" file="chromium/about_backgrou nd_color.png" type="BINDATA" /> 346 <include name="IDR_ABOUT_BACKGROUND_COLOR" file="chromium/about_backgrou nd_color.png" type="BINDATA" />
346 <include name="IDR_LOGIN_BACKGROUND" file="chromium/login_background.png " type="BINDATA" /> 347 <include name="IDR_LOGIN_BACKGROUND" file="chromium/login_background.png " type="BINDATA" />
347 <include name="IDR_LOGIN_PANEL" file="chromium/login_panel.png" type="BI NDATA" /> 348 <include name="IDR_LOGIN_PANEL" file="chromium/login_panel.png" type="BI NDATA" />
348 <include name="IDR_PRODUCT_LOGO" file="chromium/product_logo.png" type=" BINDATA" /> 349 <include name="IDR_PRODUCT_LOGO" file="chromium/product_logo.png" type=" BINDATA" />
349 <include name="IDR_PRODUCT_LOGO_WHITE" file="chromium/product_logo_white .png" type="BINDATA" /> 350 <include name="IDR_PRODUCT_LOGO_WHITE" file="chromium/product_logo_white .png" type="BINDATA" />
350 <include name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" type="BINDATA" /> 351 <include name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" type="BINDATA" />
351 <include name="IDR_WIZARD_ICON" file="chromium/wizard_icon.png" type="BI NDATA" /> 352 <include name="IDR_WIZARD_ICON" file="chromium/wizard_icon.png" type="BI NDATA" />
352 <include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" /> 353 <include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" />
353 <include name="IDR_PRODUCT_ICON_32" file="chromium/chromium_icon_32.png" type="BINDATA" /> 354 <include name="IDR_PRODUCT_ICON_32" file="chromium/chromium_icon_32.png" type="BINDATA" />
354 <include name="IDR_INFOBAR_TRANSLATE" file="chromium/infobar_translate.p ng" type="BINDATA" /> 355 <include name="IDR_INFOBAR_TRANSLATE" file="chromium/infobar_translate.p ng" type="BINDATA" />
356 <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.png" type="BINDATA" />
355 </if> 357 </if>
356 358
357 <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')"> 359 <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')">
358 <include name="IDR_THEME_FRAME" file="theme_frame_default2.png" type="BI NDATA" /> 360 <include name="IDR_THEME_FRAME" file="theme_frame_default2.png" type="BI NDATA" />
359 <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background2.png " type="BINDATA" /> 361 <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background2.png " type="BINDATA" />
360 <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_def ault_incognito_inactive2.png" type="BINDATA" /> 362 <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_def ault_incognito_inactive2.png" type="BINDATA" />
361 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default2.png" type ="BINDATA" /> 363 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default2.png" type ="BINDATA" />
362 <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_inco gnito2.png" type="BINDATA" /> 364 <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_inco gnito2.png" type="BINDATA" />
363 <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inact ive2.png" type="BINDATA" /> 365 <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inact ive2.png" type="BINDATA" />
364 366
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type= "BINDATA" /> 454 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type= "BINDATA" />
453 <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_inco gnito.png" type="BINDATA" /> 455 <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_inco gnito.png" type="BINDATA" />
454 <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inact ive.png" type="BINDATA" /> 456 <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inact ive.png" type="BINDATA" />
455 </if> 457 </if>
456 458
457 </includes> 459 </includes>
458 </release> 460 </release>
459 </grit> 461 </grit>
460 462
461 463
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698