Revert "Desktop Capture Picker New UI: Non Mac Structure Change" (htt…

…ps://codereview.chromium.org/1932413002/) This broke DesktopMediaPickerViewsDeprecatedTest on various main waterfall debug bots (e.g. https://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%2...) [4208:2052:0506/162201:4424718:FATAL:l10n_util.cc(712)] Check failed: std::string::npos != pos (4294967295 vs. 4294967295) Didn't find a $1 placeholder in Share your screen Backtrace: base::CancellationFlag::Set [0x0F7520F1+508917] base::CancellationFlag::Set [0x0F7AC6AB+879023] ui::AreTouchEventsEnabled [0x1424C6B2+469462] ui::AreTouchEventsEnabled [0x1424C0F4+467992] deprecated::DesktopMediaPickerDialogView::GetWindowTitle [0x06A160F9+41] views::TouchSelectionControllerImpl::GetSelectionHandle2Bounds [0x17A7D01D+1794589] BUG=602478 TBR=qiangchen@chromium.org Review URL: https://codereview.chromium.org/1957063002 . Cr-Commit-Position: refs/heads/master@{#392261}
Denger-Network · May 7, 2016 · c0f67d6 · c0f67d6
1 parent f520475
commit c0f67d6
Show file tree

Hide file tree

Showing 15 changed files with 145 additions and 1,449 deletions.
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
@@ -1123,11 +1123,6 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o
       <message name="IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_INVALID" desc="The text of the identity section when the page is secure, but it contains a Signed Certificate Timestamp from a known Certificate Transparency log that failed to verify.">
         Chromium verified that <ph name="ISSUER">$1<ex>VeriSign</ex></ph> issued this website's certificate. The server supplied Certificate Transparency information, but it was invalid.
       </message>
-
-      <!-- Desktop Capture -->
-      <message name="IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_TAB" desc="Text for the button on the window picker dialog, clicking which takes one to tab sharing">
-        Chromium Tab
-      </message>
 
       <!-- Runtime permission strings -->
       <if expr="is_android">

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
@@ -6104,12 +6104,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION" desc="Description for the flag to disable tab for desktop share.">
         This flag controls whether users can choose a tab for desktop share.
       </message>
-      <message name="IDS_FLAG_DISABLE_DESKTOP_CAPTURE_PICKER_OLD_UI" desc="Title for the flag to disable desktop capture picker window new UI.">
-        Disable Desktop Capture Picker Window Old UI.
-      </message>
-      <message name="IDS_FLAG_DISABLE_DESKTOP_CAPTURE_PICKER_OLD_UI_DESCRIPTION" desc="Description for the flag to disable desktop capture picker window new UI.">
-        This flag controls whether we show the old or new UI for desktop capture picker window.
-      </message>      
       <message name="IDS_TRACE_UPLOAD_URL_CHOICE_OTHER">
         Other
       </message>
@@ -13658,7 +13652,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@gmail.com</ex
 
       <!-- Desktop media picker UI for Desktop Capture API -->
       <message name="IDS_DESKTOP_MEDIA_PICKER_TITLE" desc="Title for the window picker dialog shown when desktop capture is requested by an app.">
-        Share your screen
+        Share your screen - <ph name="APP_NAME">$1<ex>Google Hangouts</ex></ph>
       </message>
       <message name="IDS_DESKTOP_MEDIA_PICKER_TEXT" desc="Text for the window picker dialog shown when desktop capture is requested by an app to be used by the app itself.">
         <ph name="APP_NAME">$1<ex>Google Hangouts</ex></ph> would like to share the contents of your screen. Choose what you'd like to share.
@@ -13677,12 +13671,6 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@gmail.com</ex
       </message>
       <message name="IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_TOOLTIP_NONE" desc="Tooltip text for the checkbox on the window picker dialog, explaining why the checkbox for audio sharing is disabled">
         Please select what to share first.
-      </message>      
-      <message name="IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_SCREEN" desc="Text for the button on the window picker dialog, clicking which takes one to full screen sharing">
-        Your Entire Screen
-      </message>
-      <message name="IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_WINDOW" desc="Text for the button on the window picker dialog, clicking which takes one to window sharing">
-        Application Window
       </message>
       <message name="IDS_DESKTOP_MEDIA_PICKER_SINGLE_SCREEN_NAME" desc="Name for screens in the desktop media picker UI when there is only one monitor.">
         Entire screen

diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
@@ -1124,11 +1124,6 @@ Signing in anyway will merge Chrome information like bookmarks, history, and oth
       <message name="IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_INVALID" desc="The text of the identity section when the page is secure, but it contains a Signed Certificate Timestamp from a known Certificate Transparency log that failed to verify.">
         Chrome verified that <ph name="ISSUER">$1<ex>VeriSign</ex></ph> issued this website's certificate. The server supplied Certificate Transparency information, but it was invalid.
       </message>
-
-      <!-- Desktop Capture -->
-      <message name="IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_TAB" desc="Text for the button on the window picker dialog, clicking which takes one to tab sharing">
-        Chrome Tab
-      </message>
 
       <!-- Runtime permission strings -->
       <if expr="is_android">

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
@@ -1528,7 +1528,8 @@ const FeatureEntry kFeatureEntries[] = {
      SINGLE_VALUE_TYPE(switches::kEnableWebRtcDtls12)},
 #endif
 #if defined(ENABLE_WEBRTC)
-    {"enable-webrtc-ecdsa", IDS_FLAGS_WEBRTC_ECDSA_NAME,
+    {"enable-webrtc-ecdsa",
+     IDS_FLAGS_WEBRTC_ECDSA_NAME,
      IDS_FLAGS_WEBRTC_ECDSA_DESCRIPTION, kOsAll,
      FEATURE_VALUE_TYPE(features::kWebRtcEcdsaDefault)},
 #endif
@@ -1766,11 +1767,6 @@ const FeatureEntry kFeatureEntries[] = {
      ENABLE_DISABLE_VALUE_TYPE(
          extensions::switches::kEnableTabForDesktopShare,
          extensions::switches::kDisableTabForDesktopShare)},
-    {"disable-desktop-capture-picker-old-ui",
-     IDS_FLAG_DISABLE_DESKTOP_CAPTURE_PICKER_OLD_UI,
-     IDS_FLAG_DISABLE_DESKTOP_CAPTURE_PICKER_OLD_UI_DESCRIPTION, kOsAll,
-     SINGLE_VALUE_TYPE(
-         extensions::switches::kDisableDesktopCapturePickerOldUI)},
 #endif
 #if defined(OS_ANDROID)
     {"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME,
@@ -1839,17 +1835,20 @@ const FeatureEntry kFeatureEntries[] = {
      SINGLE_VALUE_TYPE(switches::kEnableFullscreenTabDetaching)},
 #endif
 #if defined(OS_ANDROID)
-    {"media-style-notification", IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_NAME,
+    {"media-style-notification",
+     IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_NAME,
      IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_DESCRIPTION, kOsAndroid,
      FEATURE_VALUE_TYPE(chrome::android::kMediaStyleNotification)},
-    {"important-sites-in-cbd", IDS_FLAGS_IMPORTANT_SITES_IN_CBD_NAME,
+    {"important-sites-in-cbd",
+     IDS_FLAGS_IMPORTANT_SITES_IN_CBD_NAME,
      IDS_FLAGS_IMPORTANT_SITES_IN_CBD_DESCRIPTION, kOsAndroid,
      FEATURE_VALUE_TYPE(chrome::android::kImportantSitesInCBD)},
 #endif
     {"enable-pointer-events",  // FLAGS:RECORD_UMA
-     IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_NAME,
-     IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_DESCRIPTION, kOsAll,
-     FEATURE_VALUE_TYPE(features::kPointerEvents)},
+      IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_NAME,
+      IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_DESCRIPTION,
+      kOsAll,
+      FEATURE_VALUE_TYPE(features::kPointerEvents)},
     // NOTE: Adding new command-line switches requires adding corresponding
     // entries to enum "LoginCustomFlags" in histograms.xml. See note in
     // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.