Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2991)

Unified Diff: chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.mm

Issue 2122073004: Display extension name on device chooser title (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_chooser_controller_to_chrome_browser
Patch Set: removed unused variable Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.mm
diff --git a/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.mm b/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.mm
index 668929e196c012fa75114104a79accda46404973..0ef8a21102df7851749edab6cdfbd56d9a0c83dd 100644
--- a/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.mm
@@ -5,17 +5,9 @@
#import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.h"
#include "base/strings/sys_string_conversions.h"
-#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/chooser_controller/chooser_controller.h"
#import "chrome/browser/ui/cocoa/chooser_content_view_cocoa.h"
#import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h"
-#include "chrome/grit/generated_resources.h"
-#include "components/url_formatter/elide_url.h"
-#include "content/public/browser/web_contents.h"
-#include "extensions/browser/extension_registry.h"
-#import "ui/base/l10n/l10n_util_mac.h"
-#include "url/gurl.h"
-#include "url/origin.h"
@implementation ChooserDialogCocoaController
@@ -28,28 +20,9 @@ initWithChooserDialogCocoa:(ChooserDialogCocoa*)chooserDialogCocoa
if ((self = [super init]))
chooserDialogCocoa_ = chooserDialogCocoa;
- base::string16 chooserTitle;
- url::Origin origin = chooserController->GetOrigin();
- content::WebContents* web_contents = chooserDialogCocoa_->web_contents();
- 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)
- chooserTitle = base::UTF8ToUTF16(extension->name());
- }
-
- if (chooserTitle.empty()) {
- chooserTitle = url_formatter::FormatOriginForSecurityDisplay(
- origin, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC);
- }
-
+ base::string16 chooserTitle = chooserController->GetTitle();
chooserContentView_.reset([[ChooserContentViewCocoa alloc]
- initWithChooserTitle:l10n_util::GetNSStringF(IDS_DEVICE_CHOOSER_PROMPT,
- chooserTitle)
+ initWithChooserTitle:base::SysUTF16ToNSString(chooserTitle)
chooserController:std::move(chooserController)]);
tableView_ = [chooserContentView_ tableView];

Powered by Google App Engine
This is Rietveld 408576698