Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / app_modal_dialogs / javascript_dialog_manager.cc

diff --git a/src/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc b/src/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc
index 0377788..417a289 100644 (file)
--- a/src/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc
+++ b/src/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc
@@ -270,9 +270,13 @@ base::string16 ChromeJavaScriptDialogManager::GetTitle(
                    : IDS_JAVASCRIPT_MESSAGEBOX_DEFAULT_TITLE);
   }
 
+  // For extensions, show the extension name, but only if the origin of
+  // the alert matches the top-level WebContents.
   const Extension* extension = GetExtensionForWebContents(web_contents);
-  if (extension)
+  if (extension &&
+      web_contents->GetLastCommittedURL().GetOrigin() == origin_url) {
     return base::UTF8ToUTF16(extension->name());
+  }
 
   // Otherwise, return the formatted URL.
   // In this case, force URL to have LTR directionality.