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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.h

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 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 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_CHOOSER_DIALOG_COCOA_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_CHOOSER_DIALOG_COCOA_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_CHOOSER_DIALOG_COCOA_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_CHOOSER_DIALOG_COCOA_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
11 11
12 @class ChooserContentView; 12 @class ChooserContentViewCocoa;
13 class ChooserController; 13 class ChooserController;
14 class ChooserDialogCocoa; 14 class ChooserDialogCocoa;
15 15
16 // Displays a chooser dialog, and notifies the ChooserController 16 // Displays a chooser dialog, and notifies the ChooserController
17 // of the selected option. 17 // of the selected option.
18 @interface ChooserDialogCocoaController 18 @interface ChooserDialogCocoaController
19 : NSViewController<NSTableViewDataSource, NSTableViewDelegate> { 19 : NSViewController<NSTableViewDataSource, NSTableViewDelegate> {
20 base::scoped_nsobject<ChooserContentView> chooserContentView_; 20 base::scoped_nsobject<ChooserContentViewCocoa> chooserContentViewCocoa_;
tapted 2016/06/14 08:49:03 I see you need to rename the class to avoid a symb
juncai 2016/06/14 18:08:23 Done.
21 NSTableView* tableView_; // Weak. 21 NSTableView* tableView_; // Weak.
22 NSButton* connectButton_; // Weak. 22 NSButton* connectButton_; // Weak.
23 NSButton* cancelButton_; // Weak. 23 NSButton* cancelButton_; // Weak.
24 NSButton* helpButton_; // Weak. 24 NSButton* helpButton_; // Weak.
25 25
26 ChooserDialogCocoa* chooserDialogCocoa_; // Weak. 26 ChooserDialogCocoa* chooserDialogCocoa_; // Weak.
27 ChooserController* chooserController_; // Weak. 27 ChooserController* chooserController_; // Weak.
28 } 28 }
29 29
30 // Designated initializer. |chooserDialogCocoa| and |chooserController| 30 // Designated initializer. |chooserDialogCocoa| and |chooserController|
(...skipping 16 matching lines...) Expand all
47 47
48 // Called when the "Connect" button is pressed. 48 // Called when the "Connect" button is pressed.
49 - (void)onConnect:(id)sender; 49 - (void)onConnect:(id)sender;
50 50
51 // Called when the "Cancel" button is pressed. 51 // Called when the "Cancel" button is pressed.
52 - (void)onCancel:(id)sender; 52 - (void)onCancel:(id)sender;
53 53
54 // Called when the "Get help" button is pressed. 54 // Called when the "Get help" button is pressed.
55 - (void)onHelpPressed:(id)sender; 55 - (void)onHelpPressed:(id)sender;
56 56
57 // Gets the |chooserContentView_|. For testing only. 57 // Gets the |chooserContentViewCocoa_|. For testing only.
58 - (ChooserContentView*)chooserContentView; 58 - (ChooserContentViewCocoa*)chooserContentViewCocoa;
59 59
60 @end 60 @end
61 61
62 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_CHOOSER_DIALOG_COCOA_CONTROLLER_H_ 62 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_CHOOSER_DIALOG_COCOA_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698