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

Unified Diff: chrome/browser/ui/cocoa/chooser_content_view_cocoa.h

Issue 2169513004: Add spinner, status text and Re-scan button to Bluetooth chooser on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: modified spinner size and align rescan text with buttons 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/chooser_content_view_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/chooser_content_view_cocoa.h
diff --git a/chrome/browser/ui/cocoa/chooser_content_view_cocoa.h b/chrome/browser/ui/cocoa/chooser_content_view_cocoa.h
index f9618a74133111173fd4444e9d60a0066b7943a4..a1a2d16efc1a95da0e8cb433df8346f23bd1d18c 100644
--- a/chrome/browser/ui/cocoa/chooser_content_view_cocoa.h
+++ b/chrome/browser/ui/cocoa/chooser_content_view_cocoa.h
@@ -12,7 +12,8 @@
#include "base/mac/scoped_nsobject.h"
class ChooserController;
-class TableViewController;
+@class SpinnerView;
+class ChooserContentViewController;
// A chooser content view class that user can select an option.
@interface ChooserContentViewCocoa : NSView {
@@ -21,13 +22,16 @@ class TableViewController;
base::scoped_nsobject<NSScrollView> scrollView_;
base::scoped_nsobject<NSTableColumn> tableColumn_;
base::scoped_nsobject<NSTableView> tableView_;
+ base::scoped_nsobject<SpinnerView> spinner_;
+ base::scoped_nsobject<NSTextField> status_;
+ base::scoped_nsobject<NSButton> rescanButton_;
base::scoped_nsobject<NSButton> connectButton_;
base::scoped_nsobject<NSButton> cancelButton_;
base::scoped_nsobject<NSBox> separator_;
base::scoped_nsobject<NSTextField> message_;
base::scoped_nsobject<NSButton> helpButton_;
std::unique_ptr<ChooserController> chooserController_;
- std::unique_ptr<TableViewController> tableViewController_;
+ std::unique_ptr<ChooserContentViewController> chooserContentViewController_;
}
// Designated initializer.
@@ -50,11 +54,12 @@ class TableViewController;
// Creates the separator.
- (base::scoped_nsobject<NSBox>)createSeparator;
-// Creates the message.
-- (base::scoped_nsobject<NSTextField>)createMessage;
+// Creates a text field with |text|.
+- (base::scoped_nsobject<NSTextField>)createTextField:(NSString*)text;
-// Creates the "Get help" button.
-- (base::scoped_nsobject<NSButton>)createHelpButton;
+// Creates a hyperlink button with |text|.
+- (base::scoped_nsobject<NSButton>)createHyperlinkButtonWithText:
+ (NSString*)text;
// Gets the table view for the chooser.
- (NSTableView*)tableView;
@@ -86,6 +91,9 @@ class TableViewController;
// Called when the chooser is closed.
- (void)close;
+// Called when "Re-scan" button is pressed.
+- (void)onRescan:(id)sender;
+
// Called when the "Get help" button is pressed.
- (void)onHelpPressed:(id)sender;
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/chooser_content_view_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698