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

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

Issue 2595083002: Change ChooserContentView[Cocoa] class name to be DeviceChooserContentView[Cocoa] (Closed)
Patch Set: merge master Created 3 years, 12 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 73f7caf2dfa8971c43f4e0e7e76d8437cbc77b7b..32281bf3b4ddaa77fc7524c0c1f002e330e61122 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 "chrome/browser/chooser_controller/chooser_controller.h"
-#import "chrome/browser/ui/cocoa/chooser_content_view_cocoa.h"
+#import "chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.h"
#import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h"
@implementation ChooserDialogCocoaController
@@ -21,13 +21,13 @@ initWithChooserDialogCocoa:(ChooserDialogCocoa*)chooserDialogCocoa
chooserDialogCocoa_ = chooserDialogCocoa;
base::string16 chooserTitle = chooserController->GetTitle();
- chooserContentView_.reset([[ChooserContentViewCocoa alloc]
+ deviceChooserContentView_.reset([[DeviceChooserContentViewCocoa alloc]
initWithChooserTitle:base::SysUTF16ToNSString(chooserTitle)
chooserController:std::move(chooserController)]);
- tableView_ = [chooserContentView_ tableView];
- connectButton_ = [chooserContentView_ connectButton];
- cancelButton_ = [chooserContentView_ cancelButton];
+ tableView_ = [deviceChooserContentView_ tableView];
+ connectButton_ = [deviceChooserContentView_ connectButton];
+ cancelButton_ = [deviceChooserContentView_ cancelButton];
[connectButton_ setTarget:self];
[connectButton_ setAction:@selector(onConnect:)];
@@ -35,20 +35,20 @@ initWithChooserDialogCocoa:(ChooserDialogCocoa*)chooserDialogCocoa
[cancelButton_ setAction:@selector(onCancel:)];
[tableView_ setDelegate:self];
[tableView_ setDataSource:self];
- self.view = chooserContentView_;
- [chooserContentView_ updateTableView];
+ self.view = deviceChooserContentView_;
+ [deviceChooserContentView_ updateTableView];
return self;
}
- (NSInteger)numberOfRowsInTableView:(NSTableView*)tableView {
- return [chooserContentView_ numberOfOptions];
+ return [deviceChooserContentView_ numberOfOptions];
}
- (NSView*)tableView:(NSTableView*)tableView
viewForTableColumn:(NSTableColumn*)tableColumn
row:(NSInteger)row {
- return [chooserContentView_ createTableRowView:row].autorelease();
+ return [deviceChooserContentView_ createTableRowView:row].autorelease();
}
- (BOOL)tableView:(NSTableView*)aTableView
@@ -58,32 +58,32 @@ initWithChooserDialogCocoa:(ChooserDialogCocoa*)chooserDialogCocoa
}
- (CGFloat)tableView:(NSTableView*)tableView heightOfRow:(NSInteger)row {
- return [chooserContentView_ tableRowViewHeight:row];
+ return [deviceChooserContentView_ tableRowViewHeight:row];
}
- (void)tableViewSelectionDidChange:(NSNotification*)aNotification {
- [chooserContentView_ updateContentRowColor];
+ [deviceChooserContentView_ updateContentRowColor];
[connectButton_ setEnabled:[tableView_ numberOfSelectedRows] > 0];
}
// Selection changes (while the mouse button is still down).
- (void)tableViewSelectionIsChanging:(NSNotification*)aNotification {
- [chooserContentView_ updateContentRowColor];
+ [deviceChooserContentView_ updateContentRowColor];
[connectButton_ setEnabled:[tableView_ numberOfSelectedRows] > 0];
}
- (void)onConnect:(id)sender {
- [chooserContentView_ accept];
+ [deviceChooserContentView_ accept];
chooserDialogCocoa_->Dismissed();
}
- (void)onCancel:(id)sender {
- [chooserContentView_ cancel];
+ [deviceChooserContentView_ cancel];
chooserDialogCocoa_->Dismissed();
}
-- (ChooserContentViewCocoa*)chooserContentView {
- return chooserContentView_.get();
+- (DeviceChooserContentViewCocoa*)deviceChooserContentView {
+ return deviceChooserContentView_.get();
}
@end

Powered by Google App Engine
This is Rietveld 408576698