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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/generated_resources.grd

Side-by-side diff isn't available for this file because of its large size.
Issue 2123863004: ScreenCapture for Android phase1, part II (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments and rebase Created 4 years, 4 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
« chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerTest.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerTest.java ('k') | chrome/browser/about_flags.cc » ('j') | chrome/browser/android/tab_web_contents_delegate_android.cc » ('J')
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 517261bee52d62b16aeb6229c87a977c8909510a..bef17c61a13e82c25f7cd62c9350fb16a326eb24 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5612,6 +5612,14 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION" desc="Description of chrome:flags option to turn on Origin header for WebRTC STUN messages">
When enabled, Stun messages generated by WebRTC will contain the Origin header.
</message>
+ <if expr="is_android">
+ <message name="IDS_FLAGS_MEDIA_SCREEN_CAPTURE_NAME" desc="Name of chrome:flags option to enable screen capture." translateable="false">
braveyao 2016/08/12 23:37:44 Done
+ Experimental ScreenCapture.
+ </message>
+ <message name="IDS_FLAGS_MEDIA_SCREEN_CAPTURE_DESCRIPTION" desc="Description of chrome:flags option to enable screen capture." translateable="false">
+ Enable this option for experimental ScreenCapture feature on Android.
+ </message>
+ </if>
<if expr="enable_webrtc">
<message name="IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME" desc="Name of chrome:flags option to enable WebRTC H.264 sw encoder/decoder">
WebRTC H.264 software video encoder/decoder
@@ -12998,6 +13006,9 @@ Tell us what happened exactly before you got the profile error message:
<message name="IDS_MEDIA_CAPTURE_VIDEO_ONLY_PERMISSION_FRAGMENT" desc="Permission fragment shown in the permissions bubble when a web page requests access to the computer's camera.">
Use your camera
</message>
+ <message name="IDS_MEDIA_CAPTURE_SCREEN_PERMISSION_FRAGMENT" desc="Permission fragment shown in the permissions bubble when a web page requests access to the computer's screen.">
+ Share your screen
braveyao 2016/08/12 23:37:44 Done
+ </message>
<message name="IDS_MEDIA_CAPTURE_ALLOW" desc="Label for a button that grants access to a web page, so they can use a camera and/or a microphone.">
Allow
</message>
« chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerTest.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerTest.java ('k') | chrome/browser/about_flags.cc » ('j') | chrome/browser/android/tab_web_contents_delegate_android.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698