chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm - Issue 2065803002: Make ChromeExtensionChooserDialog::ShowDialog work for MacViews

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm

Issue 2065803002: Make ChromeExtensionChooserDialog::ShowDialog work for MacViews (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address comments Created 4 years, 6 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

« no previous file with comments | « chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm ('k') | chrome/browser/ui/views/browser_dialogs_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm b/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm

index 93b445623d532f7df6e195003388c913be2a082a..bb17f8bf654ef5b4b7d679833211eee851f49386 100644

--- a/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm

+++ b/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm

@@ -18,7 +18,7 @@

#import "chrome/browser/ui/cocoa/base_bubble_controller.h"

#import "chrome/browser/ui/cocoa/browser_window_controller.h"

#import "chrome/browser/ui/cocoa/browser_window_utils.h"

-#import "chrome/browser/ui/cocoa/chooser_content_view.h"

+#import "chrome/browser/ui/cocoa/chooser_content_view_cocoa.h"

#import "chrome/browser/ui/cocoa/info_bubble_view.h"

#import "chrome/browser/ui/cocoa/info_bubble_window.h"

#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"

@@ -46,7 +46,7 @@ std::unique_ptr<BubbleUi> ChooserBubbleDelegate::BuildBubbleUi() {

ChooserBubbleUiCocoa* bridge_; // Weak.

bool buttonPressed_;

- base::scoped_nsobject<ChooserContentView> chooserContentView_;

+ base::scoped_nsobject<ChooserContentViewCocoa> chooserContentView_;

NSTableView* tableView_; // Weak.

NSButton* connectButton_; // Weak.

NSButton* cancelButton_; // Weak.

@@ -168,7 +168,7 @@ std::unique_ptr<BubbleUi> ChooserBubbleDelegate::BuildBubbleUi() {

}

- (void)show {

- chooserContentView_.reset([[ChooserContentView alloc]

+ chooserContentView_.reset([[ChooserContentViewCocoa alloc]

initWithChooserTitle:

l10n_util::GetNSStringF(

IDS_CHOOSER_BUBBLE_PROMPT,