Display extension name on device chooser title

chrome/browser/ui/views/extensions/chooser_dialog_view.cc

 // Copyright 2016 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.
 
 #include "chrome/browser/ui/views/extensions/chooser_dialog_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chooser_controller/chooser_controller.h"
 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.h"
 #include "chrome/browser/ui/views/chooser_content_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
-#include "components/url_formatter/elide_url.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/browser_thread.h"
-#include "extensions/browser/extension_registry.h"
-#include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/window/dialog_client_view.h"
 
 ChooserDialogView::ChooserDialogView(
-    content::WebContents* web_contents,
     std::unique_ptr<ChooserController> chooser_controller)
-    : web_contents_(web_contents), chooser_content_view_(nullptr) {
+    : chooser_content_view_(nullptr) {

[Reilly Grant (use Gerrit), 2016/07/11 21:48:03]

This doesn't need to be initialized here because it is unconditionally
initialized below.

[juncai, 2016/07/11 23:16:44]

Done.

   // ------------------------------------
   // | Chooser dialog title             |
   // | -------------------------------- |
   // | | option 0                     | |
   // | | option 1                     | |
   // | | option 2                     | |
   // | |                              | |
   // | |                              | |
   // | |                              | |
   // | -------------------------------- |
   // |           [ Connect ] [ Cancel ] |
   // |----------------------------------|
   // | Not seeing your device? Get help |
   // ------------------------------------
 
-  DCHECK(web_contents_);
   DCHECK(chooser_controller);
-  origin_ = chooser_controller->GetOrigin();
   chooser_content_view_ =
       new ChooserContentView(this, std::move(chooser_controller));
 }
 
 ChooserDialogView::~ChooserDialogView() {}
 
 base::string16 ChooserDialogView::GetWindowTitle() const {
-  base::string16 chooser_title;
-  content::BrowserContext* browser_context = web_contents_->GetBrowserContext();
-  extensions::ExtensionRegistry* extension_registry =
-      extensions::ExtensionRegistry::Get(browser_context);
-  if (extension_registry) {
-    const extensions::Extension* extension =
-        extension_registry->enabled_extensions().GetExtensionOrAppByURL(
-            GURL(origin_.Serialize()));
-    if (extension)
-      chooser_title = base::UTF8ToUTF16(extension->name());
-  }
-
-  if (chooser_title.empty()) {
-    chooser_title = url_formatter::FormatOriginForSecurityDisplay(
-        origin_, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC);
-  }
-
-  return l10n_util::GetStringFUTF16(IDS_DEVICE_CHOOSER_PROMPT, chooser_title);
+  return chooser_content_view_->GetWindowTitle();
 }
 
 bool ChooserDialogView::ShouldShowCloseButton() const {
   return false;
 }
 
 ui::ModalType ChooserDialogView::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
 
@@ skipping 53 matching lines @@
 
 void ChromeExtensionChooserDialog::ShowDialogImpl(
     std::unique_ptr<ChooserController> chooser_controller) const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(chooser_controller);
 
   web_modal::WebContentsModalDialogManager* manager =
       web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_);
   if (manager) {
     constrained_window::ShowWebModalDialogViews(
-        new ChooserDialogView(web_contents_, std::move(chooser_controller)),
-        web_contents_);
+        new ChooserDialogView(std::move(chooser_controller)), web_contents_);
   }
 }