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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/core.gypi

Issue 158333002: Merge MediaControlsChromium into MediaControls (2nd try) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: if OS(ANDRIOD) Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/html/shadow/MediaControls.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/core.gypi
diff --git a/Source/core/core.gypi b/Source/core/core.gypi
index a32f77237e0cac7460bd8a1cadeb1267132cde21..f80ae0714e35f4d3b923120e46d2126023c69216 100644
--- a/Source/core/core.gypi
+++ b/Source/core/core.gypi
@@ -2672,14 +2672,12 @@
'html/shadow/HTMLContentElement.h',
'html/shadow/HTMLShadowElement.cpp',
'html/shadow/HTMLShadowElement.h',
- 'html/shadow/MediaControls.cpp',
- 'html/shadow/MediaControls.h',
'html/shadow/MediaControlElementTypes.cpp',
'html/shadow/MediaControlElementTypes.h',
'html/shadow/MediaControlElements.cpp',
'html/shadow/MediaControlElements.h',
- 'html/shadow/MediaControlsChromium.cpp',
- 'html/shadow/MediaControlsChromium.h',
+ 'html/shadow/MediaControls.cpp',
+ 'html/shadow/MediaControls.h',
'html/shadow/MediaControlsChromiumAndroid.cpp',
'html/shadow/MediaControlsChromiumAndroid.h',
'html/shadow/MeterShadowElement.cpp',
« no previous file with comments | « no previous file | Source/core/html/shadow/MediaControls.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698