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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: public/blink_resources.grd

Issue 1156993013: New media playback UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed tests (thanks, trybots!) and duration display. Created 5 years, 6 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
« Source/core/paint/MediaControlsPainter.cpp ('K') | « public/blink_image_resources.grd ('k') | public/default_100_percent/blink/mediaplayer_cast_off_new.png » ('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/blink_resources.h" type="rc_header"> 4 <output filename="grit/blink_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="blink_resources.rc" type="rc_all" /> 7 <output filename="blink_resources.rc" type="rc_all" />
8 <output filename="blink_resources.pak" type="data_package" /> 8 <output filename="blink_resources.pak" type="data_package" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
11 <includes> 11 <includes>
12 <include name="IDR_UASTYLE_HTML_CSS" file="../Source/core/css/html.css" ty pe="BINDATA"/> 12 <include name="IDR_UASTYLE_HTML_CSS" file="../Source/core/css/html.css" ty pe="BINDATA"/>
13 <include name="IDR_UASTYLE_QUIRKS_CSS" file="../Source/core/css/quirks.css " type="BINDATA"/> 13 <include name="IDR_UASTYLE_QUIRKS_CSS" file="../Source/core/css/quirks.css " type="BINDATA"/>
14 <include name="IDR_UASTYLE_VIEW_SOURCE_CSS" file="../Source/core/css/view- source.css" type="BINDATA"/> 14 <include name="IDR_UASTYLE_VIEW_SOURCE_CSS" file="../Source/core/css/view- source.css" type="BINDATA"/>
15 <include name="IDR_UASTYLE_THEME_CHROMIUM_CSS" file="../Source/core/css/th emeChromium.css" type="BINDATA"/> 15 <include name="IDR_UASTYLE_THEME_CHROMIUM_CSS" file="../Source/core/css/th emeChromium.css" type="BINDATA"/>
16 <if expr="is_android"> 16 <if expr="is_android">
17 <include name="IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS" file="../Source/c ore/css/themeChromiumAndroid.css" type="BINDATA"/> 17 <include name="IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS" file="../Source/c ore/css/themeChromiumAndroid.css" type="BINDATA"/>
18 <include name="IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS" file="../Source/c ore/css/mediaControlsAndroid.css" type="BINDATA"/> 18 <include name="IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS" file="../Source/c ore/css/mediaControlsAndroid.css" type="BINDATA"/>
19 <include name="IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_NEW_CSS" file="../Sour ce/core/css/mediaControlsAndroidNew.css" type="BINDATA"/>
19 </if> 20 </if>
20 <if expr="not is_win"> 21 <if expr="not is_win">
21 <include name="IDR_UASTYLE_THEME_CHROMIUM_LINUX_CSS" file="../Source/cor e/css/themeChromiumLinux.css" type="BINDATA"/> 22 <include name="IDR_UASTYLE_THEME_CHROMIUM_LINUX_CSS" file="../Source/cor e/css/themeChromiumLinux.css" type="BINDATA"/>
22 </if> 23 </if>
23 <if expr="is_macosx"> 24 <if expr="is_macosx">
24 <include name="IDR_UASTYLE_THEME_MAC_CSS" file="../Source/core/css/theme Mac.css" type="BINDATA"/> 25 <include name="IDR_UASTYLE_THEME_MAC_CSS" file="../Source/core/css/theme Mac.css" type="BINDATA"/>
25 </if> 26 </if>
26 <include name="IDR_UASTYLE_THEME_CHROMIUM_SKIA_CSS" file="../Source/core/c ss/themeChromiumSkia.css" type="BINDATA"/> 27 <include name="IDR_UASTYLE_THEME_CHROMIUM_SKIA_CSS" file="../Source/core/c ss/themeChromiumSkia.css" type="BINDATA"/>
27 <include name="IDR_UASTYLE_THEME_INPUT_MULTIPLE_FIELDS_CSS" file="../Sourc e/core/css/themeInputMultipleFields.css" type="BINDATA"/> 28 <include name="IDR_UASTYLE_THEME_INPUT_MULTIPLE_FIELDS_CSS" file="../Sourc e/core/css/themeInputMultipleFields.css" type="BINDATA"/>
28 <include name="IDR_UASTYLE_THEME_WIN_CSS" file="../Source/core/css/themeWi n.css" type="BINDATA"/> 29 <include name="IDR_UASTYLE_THEME_WIN_CSS" file="../Source/core/css/themeWi n.css" type="BINDATA"/>
29 <include name="IDR_UASTYLE_THEME_WIN_QUIRKS_CSS" file="../Source/core/css/ themeWinQuirks.css" type="BINDATA"/> 30 <include name="IDR_UASTYLE_THEME_WIN_QUIRKS_CSS" file="../Source/core/css/ themeWinQuirks.css" type="BINDATA"/>
30 <include name="IDR_UASTYLE_SVG_CSS" file="../Source/core/css/svg.css" type ="BINDATA"/> 31 <include name="IDR_UASTYLE_SVG_CSS" file="../Source/core/css/svg.css" type ="BINDATA"/>
31 <include name="IDR_UASTYLE_MATHML_CSS" file="../Source/core/css/mathml.css " type="BINDATA"/> 32 <include name="IDR_UASTYLE_MATHML_CSS" file="../Source/core/css/mathml.css " type="BINDATA"/>
32 <include name="IDR_UASTYLE_MEDIA_CONTROLS_CSS" file="../Source/core/css/me diaControls.css" type="BINDATA"/> 33 <include name="IDR_UASTYLE_MEDIA_CONTROLS_CSS" file="../Source/core/css/me diaControls.css" type="BINDATA"/>
34 <include name="IDR_UASTYLE_MEDIA_CONTROLS_NEW_CSS" file="../Source/core/cs s/mediaControlsNew.css" type="BINDATA"/>
33 <include name="IDR_UASTYLE_FULLSCREEN_CSS" file="../Source/core/css/fullsc reen.css" type="BINDATA"/> 35 <include name="IDR_UASTYLE_FULLSCREEN_CSS" file="../Source/core/css/fullsc reen.css" type="BINDATA"/>
34 <include name="IDR_UASTYLE_XHTMLMP_CSS" file="../Source/core/css/xhtmlmp.c ss" type="BINDATA"/> 36 <include name="IDR_UASTYLE_XHTMLMP_CSS" file="../Source/core/css/xhtmlmp.c ss" type="BINDATA"/>
35 <include name="IDR_UASTYLE_VIEWPORT_ANDROID_CSS" file="../Source/core/css/ viewportAndroid.css" type="BINDATA"/> 37 <include name="IDR_UASTYLE_VIEWPORT_ANDROID_CSS" file="../Source/core/css/ viewportAndroid.css" type="BINDATA"/>
36 38
37 <include name="IDR_INSPECTOR_OVERLAY_PAGE_HTML" file="../Source/core/inspe ctor/InspectorOverlayPage.html" type="BINDATA"/> 39 <include name="IDR_INSPECTOR_OVERLAY_PAGE_HTML" file="../Source/core/inspe ctor/InspectorOverlayPage.html" type="BINDATA"/>
38 <include name="IDR_INSPECTOR_INJECTED_SCRIPT_SOURCE_JS" file="../Source/co re/inspector/InjectedScriptSource.js" type="BINDATA"/> 40 <include name="IDR_INSPECTOR_INJECTED_SCRIPT_SOURCE_JS" file="../Source/co re/inspector/InjectedScriptSource.js" type="BINDATA"/>
39 <include name="IDR_INSPECTOR_DEBUGGER_SCRIPT_SOURCE_JS" file="../Source/bi ndings/core/v8/DebuggerScript.js" type="BINDATA"/> 41 <include name="IDR_INSPECTOR_DEBUGGER_SCRIPT_SOURCE_JS" file="../Source/bi ndings/core/v8/DebuggerScript.js" type="BINDATA"/>
40 <include name="IDR_PRIVATE_SCRIPT_DOCUMENTEXECCOMMAND_JS" file="../Source/ core/editing/js/DocumentExecCommand.js" type="BINDATA"/> 42 <include name="IDR_PRIVATE_SCRIPT_DOCUMENTEXECCOMMAND_JS" file="../Source/ core/editing/js/DocumentExecCommand.js" type="BINDATA"/>
41 <include name="IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_CSS" file="../Sour ce/core/xml/DocumentXMLTreeViewer.css" type="BINDATA"/> 43 <include name="IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_CSS" file="../Sour ce/core/xml/DocumentXMLTreeViewer.css" type="BINDATA"/>
42 <include name="IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_JS" file="../Sourc e/core/xml/DocumentXMLTreeViewer.js" type="BINDATA"/> 44 <include name="IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_JS" file="../Sourc e/core/xml/DocumentXMLTreeViewer.js" type="BINDATA"/>
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 <include name="IDR_AUDIO_SPATIALIZATION_T345_P060" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P060.wav" type="BINDATA"/> 299 <include name="IDR_AUDIO_SPATIALIZATION_T345_P060" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P060.wav" type="BINDATA"/>
298 <include name="IDR_AUDIO_SPATIALIZATION_T345_P075" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P075.wav" type="BINDATA"/> 300 <include name="IDR_AUDIO_SPATIALIZATION_T345_P075" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P075.wav" type="BINDATA"/>
299 <include name="IDR_AUDIO_SPATIALIZATION_T345_P090" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P090.wav" type="BINDATA"/> 301 <include name="IDR_AUDIO_SPATIALIZATION_T345_P090" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P090.wav" type="BINDATA"/>
300 <include name="IDR_AUDIO_SPATIALIZATION_T345_P315" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P315.wav" type="BINDATA"/> 302 <include name="IDR_AUDIO_SPATIALIZATION_T345_P315" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P315.wav" type="BINDATA"/>
301 <include name="IDR_AUDIO_SPATIALIZATION_T345_P330" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P330.wav" type="BINDATA"/> 303 <include name="IDR_AUDIO_SPATIALIZATION_T345_P330" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P330.wav" type="BINDATA"/>
302 <include name="IDR_AUDIO_SPATIALIZATION_T345_P345" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P345.wav" type="BINDATA"/> 304 <include name="IDR_AUDIO_SPATIALIZATION_T345_P345" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P345.wav" type="BINDATA"/>
303 </if> 305 </if>
304 </includes> 306 </includes>
305 </release> 307 </release>
306 </grit> 308 </grit>
OLDNEW
« Source/core/paint/MediaControlsPainter.cpp ('K') | « public/blink_image_resources.grd ('k') | public/default_100_percent/blink/mediaplayer_cast_off_new.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698