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

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

Issue 2065803002: Make ChromeExtensionChooserDialog::ShowDialog work for MacViews (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed TODO 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
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 e0f79117ee809061763143505ea2b34b7d03f095..1e5b1800606a735d82b079b2067e6cd509fc0859 100644
--- a/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.mm
@@ -6,7 +6,7 @@
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.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/extensions/chooser_dialog_cocoa.h"
#include "chrome/grit/generated_resources.h"
#include "components/chooser_controller/chooser_controller.h"
@@ -48,14 +48,14 @@ initWithChooserDialogCocoa:(ChooserDialogCocoa*)chooserDialogCocoa
origin, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC);
}
- chooserContentView_.reset([[ChooserContentView alloc]
+ chooserContentViewCocoa_.reset([[ChooserContentViewCocoa alloc]
initWithChooserTitle:l10n_util::GetNSStringF(IDS_CHOOSER_BUBBLE_PROMPT,
chooserTitle)]);
- tableView_ = [chooserContentView_ tableView];
- connectButton_ = [chooserContentView_ connectButton];
- cancelButton_ = [chooserContentView_ cancelButton];
- helpButton_ = [chooserContentView_ helpButton];
+ tableView_ = [chooserContentViewCocoa_ tableView];
+ connectButton_ = [chooserContentViewCocoa_ connectButton];
+ cancelButton_ = [chooserContentViewCocoa_ cancelButton];
+ helpButton_ = [chooserContentViewCocoa_ helpButton];
[connectButton_ setTarget:self];
[connectButton_ setAction:@selector(onConnect:)];
@@ -65,7 +65,7 @@ initWithChooserDialogCocoa:(ChooserDialogCocoa*)chooserDialogCocoa
[tableView_ setDataSource:self];
[helpButton_ setTarget:self];
[helpButton_ setAction:@selector(onHelpPressed:)];
- self.view = chooserContentView_;
+ self.view = chooserContentViewCocoa_;
[self updateTableView];
return self;
@@ -148,8 +148,8 @@ initWithChooserDialogCocoa:(ChooserDialogCocoa*)chooserDialogCocoa
chooserController_->OpenHelpCenterUrl();
}
-- (ChooserContentView*)chooserContentView {
- return chooserContentView_.get();
+- (ChooserContentViewCocoa*)chooserContentViewCocoa {
+ return chooserContentViewCocoa_.get();
}
@end

Powered by Google App Engine
This is Rietveld 408576698