Check page URL origin to determine JavaScript alert titles.

ios/chrome/browser/ui/dialogs/dialog_presenter.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/ui/dialogs/dialog_presenter.h"
 
 #include <deque>
 #include <map>
 
 #import "base/ios/block_types.h"
@@ skipping 116 matching lines @@
             self.presentedDialogCoordinator != nil);
   return self.presentedDialogCoordinator != nil;
 }
 
 #pragma mark - Public
 
 - (void)runJavaScriptAlertPanelWithMessage:(NSString*)message
                                 requestURL:(const GURL&)requestURL
                                   webState:(web::WebState*)webState
                          completionHandler:(void (^)(void))completionHandler {
-  NSString* title =
-      [DialogPresenter localizedTitleForJavaScriptAlertFromPage:requestURL];
+  NSString* title = [DialogPresenter
+      localizedTitleForJavaScriptAlertFromPage:requestURL
+                                  mainFrameURL:webState->GetLastCommittedURL()];
   AlertCoordinator* alertCoordinator =
       [[AlertCoordinator alloc] initWithBaseViewController:self.viewController
                                                      title:title
                                                    message:message];
 
   // Handler.
   __weak DialogPresenter* weakSelf = self;
   __weak AlertCoordinator* weakCoordinator = alertCoordinator;
   ProceduralBlock OKHandler = ^{
     if (completionHandler)
@@ skipping 14 matching lines @@
   [self setUpBlockingOptionForCoordinator:alertCoordinator webState:webState];
 
   [self addDialogCoordinator:alertCoordinator forWebState:webState];
 }
 
 - (void)runJavaScriptConfirmPanelWithMessage:(NSString*)message
                                   requestURL:(const GURL&)requestURL
                                     webState:(web::WebState*)webState
                            completionHandler:
                                (void (^)(BOOL isConfirmed))completionHandler {
-  NSString* title =
-      [DialogPresenter localizedTitleForJavaScriptAlertFromPage:requestURL];
+  NSString* title = [DialogPresenter
+      localizedTitleForJavaScriptAlertFromPage:requestURL
+                                  mainFrameURL:webState->GetLastCommittedURL()];

[PL, 2017/06/28 23:18:34]

Is GetLastCommittedURL() the right URL to use here for the main frame? Thanks!

   AlertCoordinator* alertCoordinator =
       [[AlertCoordinator alloc] initWithBaseViewController:self.viewController
                                                      title:title
                                                    message:message];
 
   // Actions.
   ProceduralBlock confirmAction = ^{
     if (completionHandler)
       completionHandler(YES);
   };
@@ skipping 15 matching lines @@
 
   [self addDialogCoordinator:alertCoordinator forWebState:webState];
 }
 
 - (void)runJavaScriptTextInputPanelWithPrompt:(NSString*)message
                                   defaultText:(NSString*)defaultText
                                    requestURL:(const GURL&)requestURL
                                      webState:(web::WebState*)webState
                             completionHandler:
                                 (void (^)(NSString* input))completionHandler {
-  NSString* title =
-      [DialogPresenter localizedTitleForJavaScriptAlertFromPage:requestURL];
+  NSString* title = [DialogPresenter
+      localizedTitleForJavaScriptAlertFromPage:requestURL
+                                  mainFrameURL:webState->GetLastCommittedURL()];
   InputAlertCoordinator* alertCoordinator = [[InputAlertCoordinator alloc]
       initWithBaseViewController:self.viewController
                            title:title
                          message:message];
 
   // Actions.
   __weak InputAlertCoordinator* weakCoordinator = alertCoordinator;
   ProceduralBlock confirmAction = ^{
     if (completionHandler) {
       NSString* textInput = [weakCoordinator textFields].firstObject.text;
@@ skipping 121 matching lines @@
   // displayed.
   if (self.blockingConfirmationCoordinator)
     return;
   // The active TabModel can't be changed while a JavaScript dialog is shown.
   DCHECK(!self.showingDialog);
   if (_active && !_queuedWebStates.empty() && !self.delegate.presenting)
     [self showNextDialog];
 }
 
 + (NSString*)localizedTitleForJavaScriptAlertFromPage:(const GURL&)pageURL {
+  return [self localizedTitleForJavaScriptAlertFromPage:pageURL
+                                           mainFrameURL:pageURL];
+}
+
++ (NSString*)localizedTitleForJavaScriptAlertFromPage:(const GURL&)pageURL
+                                         mainFrameURL:
+                                             (const GURL&)mainFrameURL {
   NSString* localizedTitle = nil;
   NSString* hostname = base::SysUTF8ToNSString(pageURL.host());
-  if (!hostname.length) {
+
+  bool is_same_origin_as_main_frame =

[Eugene But (OOO till 7-30), 2017/06/29 01:00:01]

s/is_same_origin_as_main_frame/sameOriginAsMainFrame

[PL, 2017/06/29 20:02:21]

Thanks! I'm not sure how long it will take me to get this convention right :-O.

+      pageURL.GetOrigin() == mainFrameURL.GetOrigin();
+
+  if (!is_same_origin_as_main_frame) {
     localizedTitle = l10n_util::GetNSString(
         IDS_JAVASCRIPT_MESSAGEBOX_TITLE_NONSTANDARD_URL_IFRAME);
   } else {
     localizedTitle = l10n_util::GetNSStringF(
         IDS_JAVASCRIPT_MESSAGEBOX_TITLE, base::SysNSStringToUTF16(hostname));
   }
   return localizedTitle;
 }
 
 #pragma mark - Private methods.
@@ skipping 141 matching lines @@
                                         style:UIAlertActionStyleDestructive];
     [confirmationCoordinator addItemWithTitle:l10n_util::GetNSString(IDS_CANCEL)
                                        action:cancelHandler
                                         style:UIAlertActionStyleCancel];
     [weakSelf setBlockingConfirmationCoordinator:confirmationCoordinator];
     [[weakSelf blockingConfirmationCoordinator] start];
   } copy];
 }
 
 @end