Adjust strings for AR mode entry

Bug: https://crbug.com/1054042
Change-Id: I5b3009997f76ec79f9ffc6abb1ba669f3f010ce9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2063671
Commit-Queue: Piotr Bialecki <bialpio@chromium.org>
Reviewed-by: Alexander Cooper <alcooper@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742779}

chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/ArConsentDialog.java

@@ -17,6 +17,9 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabImpl;
+import org.chromium.components.url_formatter.SchemeDisplay;
+import org.chromium.components.url_formatter.UrlFormatter;
+import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.base.PermissionCallback;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.modaldialog.DialogDismissalCause;
@@ -47,11 +50,17 @@ public class ArConsentDialog implements ModalDialogProperties.Controller {
     private ModalDialogManager mModalDialogManager;
     private long mNativeArConsentDialog;
     private WindowAndroid mWindowAndroid;
+    // URL of the page entering AR.
+    private String mUrl;
 
     @CalledByNative
     private static ArConsentDialog showDialog(long instance, @NonNull final Tab tab) {
-        ArConsentDialog dialog = new ArConsentDialog(instance);
+        WebContents webContents = tab.getWebContents();
+        String url = webContents.getLastCommittedUrl();
+        ArConsentDialog dialog = new ArConsentDialog(instance, url);
+
         dialog.show(((TabImpl) tab).getActivity());
+
         return dialog;
     }
 
@@ -61,17 +70,21 @@ public class ArConsentDialog implements ModalDialogProperties.Controller {
         mModalDialogManager.dismissAllDialogs(DialogDismissalCause.UNKNOWN);
     }
 
-    private ArConsentDialog(long arConsentDialog) {
+    private ArConsentDialog(long arConsentDialog, String url) {
         mNativeArConsentDialog = arConsentDialog;
+        mUrl = url;
     }
 
     public void show(ChromeActivity activity) {
         mWindowAndroid = activity.getWindowAndroid();
         Resources resources = activity.getResources();
+
+        String dialogTitle = resources.getString(R.string.ar_immersive_mode_consent_title,
+                UrlFormatter.formatUrlForSecurityDisplay(mUrl, SchemeDisplay.OMIT_HTTP_AND_HTTPS));
+
         PropertyModel model = new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS)
                                       .with(ModalDialogProperties.CONTROLLER, this)
-                                      .with(ModalDialogProperties.TITLE, resources,
-                                              R.string.ar_immersive_mode_consent_title)
+                                      .with(ModalDialogProperties.TITLE, dialogTitle)
                                       .with(ModalDialogProperties.MESSAGE, resources,
                                               R.string.ar_immersive_mode_consent_message)
                                       .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, resources,

chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -3598,14 +3598,14 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
           Augmented Reality
         </message>
         <message name="IDS_AR_IMMERSIVE_MODE_CONSENT_TITLE" desc="Title for dialog shown when a site requests consent for starting an augmented reality session.">
-          Start Augmented Reality session?
+          Enter AR from <ph name="DOMAIN">%s<ex>example.com</ex></ph>?
         </message>
         <message name="IDS_AR_IMMERSIVE_MODE_CONSENT_MESSAGE" desc="Message for dialog shown when a site requests consent for starting an augmented reality session.">
-          For the duration of this session, the site will be able to:
+          While you're in AR, this site may be able to:
 • create a 3D map of your environment
 • track camera motion
 
-The site does NOT gain access to the camera. The camera images are only visible to you.
+Only you can see what your camera is looking at. The site can't see your camera's images.
         </message>
         <message name="IDS_AR_IMMERSIVE_MODE_CONSENT_BUTTON" desc="Confirm button for dialog shown when a site requests consent for starting an augmented reality session.">
           Enter AR

chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_AR_IMMERSIVE_MODE_CONSENT_BUTTON.png.sha1

-e74fa94d9cdb44a1e0fd6775706a1ec6027c7bae
+45a159c60efc8bf926c8e89787ff9212bfffb83c
\ No newline at end of file

chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_AR_IMMERSIVE_MODE_CONSENT_MESSAGE.png.sha1

-e74fa94d9cdb44a1e0fd6775706a1ec6027c7bae
+caf897ed2839d89787145a0acb75b02b117e9d66
\ No newline at end of file

chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_AR_IMMERSIVE_MODE_CONSENT_TITLE.png.sha1

-e74fa94d9cdb44a1e0fd6775706a1ec6027c7bae
+2f474dc661b55506e97299a4c4012b56f59aa6a8
\ No newline at end of file