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

Unified Diff: chrome/app/generated_resources.grd

Issue 16309003: Fix the resources for the TV build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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:
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index a36ec16b76645d23aa7336a475d5d30b4d2e68c8..30d07ce429a7073df8df926edb615789487c793a 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6678,7 +6678,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION" desc="Description for the flag to enable asynchronous DNS client.">
Enable experimental asynchronous DNS client.
</message>
- <if expr="is_android">
+ <if expr="is_android and not pp_ifdef('google_tv')">
<message name="IDS_FLAGS_ENABLE_WEBKIT_MEDIA_SOURCE_NAME" desc="Title for the flag to enable the prefixed Media Source API.">
Enable prefixed Media Source API.
</message>
@@ -6686,7 +6686,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Enable the experimental WebKitMediaSource object. This object allows JavaScript to send media data directly to a video element.
</message>
</if>
- <if expr="not is_android">
+ <if expr="not is_android or pp_ifdef('google_tv')">
<message name="IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_NAME" desc="Title for the flag to disable the prefixed Media Source API.">
Disable prefixed Media Source API.
</message>
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698