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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.h" 5 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.h"
6 6
7 #include "base/strings/sys_string_conversions.h" 7 #include "base/strings/sys_string_conversions.h"
8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/chooser_controller/chooser_controller.h" 8 #include "chrome/browser/chooser_controller/chooser_controller.h"
10 #import "chrome/browser/ui/cocoa/chooser_content_view_cocoa.h" 9 #import "chrome/browser/ui/cocoa/chooser_content_view_cocoa.h"
11 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h" 10 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h"
12 #include "chrome/grit/generated_resources.h"
13 #include "components/url_formatter/elide_url.h"
14 #include "content/public/browser/web_contents.h"
15 #include "extensions/browser/extension_registry.h"
16 #import "ui/base/l10n/l10n_util_mac.h"
17 #include "url/gurl.h"
18 #include "url/origin.h"
19 11
20 @implementation ChooserDialogCocoaController 12 @implementation ChooserDialogCocoaController
21 13
22 - (instancetype) 14 - (instancetype)
23 initWithChooserDialogCocoa:(ChooserDialogCocoa*)chooserDialogCocoa 15 initWithChooserDialogCocoa:(ChooserDialogCocoa*)chooserDialogCocoa
24 chooserController: 16 chooserController:
25 (std::unique_ptr<ChooserController>)chooserController { 17 (std::unique_ptr<ChooserController>)chooserController {
26 DCHECK(chooserDialogCocoa); 18 DCHECK(chooserDialogCocoa);
27 DCHECK(chooserController); 19 DCHECK(chooserController);
28 if ((self = [super init])) 20 if ((self = [super init]))
29 chooserDialogCocoa_ = chooserDialogCocoa; 21 chooserDialogCocoa_ = chooserDialogCocoa;
30 22
31 base::string16 chooserTitle; 23 base::string16 chooserTitle = chooserController->GetTitle();
32 url::Origin origin = chooserController->GetOrigin();
33 content::WebContents* web_contents = chooserDialogCocoa_->web_contents();
34 content::BrowserContext* browser_context = web_contents->GetBrowserContext();
35 extensions::ExtensionRegistry* extension_registry =
36 extensions::ExtensionRegistry::Get(browser_context);
37 if (extension_registry) {
38 const extensions::Extension* extension =
39 extension_registry->enabled_extensions().GetExtensionOrAppByURL(
40 GURL(origin.Serialize()));
41 if (extension)
42 chooserTitle = base::UTF8ToUTF16(extension->name());
43 }
44
45 if (chooserTitle.empty()) {
46 chooserTitle = url_formatter::FormatOriginForSecurityDisplay(
47 origin, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC);
48 }
49
50 chooserContentView_.reset([[ChooserContentViewCocoa alloc] 24 chooserContentView_.reset([[ChooserContentViewCocoa alloc]
51 initWithChooserTitle:l10n_util::GetNSStringF(IDS_DEVICE_CHOOSER_PROMPT, 25 initWithChooserTitle:base::SysUTF16ToNSString(chooserTitle)
52 chooserTitle)
53 chooserController:std::move(chooserController)]); 26 chooserController:std::move(chooserController)]);
54 27
55 tableView_ = [chooserContentView_ tableView]; 28 tableView_ = [chooserContentView_ tableView];
56 connectButton_ = [chooserContentView_ connectButton]; 29 connectButton_ = [chooserContentView_ connectButton];
57 cancelButton_ = [chooserContentView_ cancelButton]; 30 cancelButton_ = [chooserContentView_ cancelButton];
58 31
59 [connectButton_ setTarget:self]; 32 [connectButton_ setTarget:self];
60 [connectButton_ setAction:@selector(onConnect:)]; 33 [connectButton_ setAction:@selector(onConnect:)];
61 [cancelButton_ setTarget:self]; 34 [cancelButton_ setTarget:self];
62 [cancelButton_ setAction:@selector(onCancel:)]; 35 [cancelButton_ setAction:@selector(onCancel:)];
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 - (void)onCancel:(id)sender { 69 - (void)onCancel:(id)sender {
97 [chooserContentView_ cancel]; 70 [chooserContentView_ cancel];
98 chooserDialogCocoa_->Dismissed(); 71 chooserDialogCocoa_->Dismissed();
99 } 72 }
100 73
101 - (ChooserContentViewCocoa*)chooserContentView { 74 - (ChooserContentViewCocoa*)chooserContentView {
102 return chooserContentView_.get(); 75 return chooserContentView_.get();
103 } 76 }
104 77
105 @end 78 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698