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

Side by Side Diff: chrome/browser/ui/cocoa/chooser_content_view_cocoa.mm

Issue 2155743002: Add throbber and status text to WebBluetooth chooser UI on non-Mac desktops (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed some unnecessary include files and forward declarations 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 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 #import "chrome/browser/ui/cocoa/chooser_content_view_cocoa.h" 5 #import "chrome/browser/ui/cocoa/chooser_content_view_cocoa.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 class TableViewController : public ChooserController::Observer { 43 class TableViewController : public ChooserController::Observer {
44 public: 44 public:
45 TableViewController(ChooserController* chooser_controller, 45 TableViewController(ChooserController* chooser_controller,
46 NSTableView* table_view); 46 NSTableView* table_view);
47 ~TableViewController() override; 47 ~TableViewController() override;
48 48
49 // ChooserController::Observer: 49 // ChooserController::Observer:
50 void OnOptionsInitialized() override; 50 void OnOptionsInitialized() override;
51 void OnOptionAdded(size_t index) override; 51 void OnOptionAdded(size_t index) override;
52 void OnOptionRemoved(size_t index) override; 52 void OnOptionRemoved(size_t index) override;
53 void AdapterOn() override;
54 void AdapterOff() override;
55 void Refresh() override;
56 void Idle() override;
53 57
54 void UpdateTableView(); 58 void UpdateTableView();
55 59
56 private: 60 private:
57 ChooserController* chooser_controller_; 61 ChooserController* chooser_controller_;
58 NSTableView* table_view_; 62 NSTableView* table_view_;
59 63
60 DISALLOW_COPY_AND_ASSIGN(TableViewController); 64 DISALLOW_COPY_AND_ASSIGN(TableViewController);
61 }; 65 };
62 66
(...skipping 28 matching lines...) Expand all
91 if (selected_row == idx) 95 if (selected_row == idx)
92 [table_view_ deselectRow:idx]; 96 [table_view_ deselectRow:idx];
93 else if (selected_row > idx) 97 else if (selected_row > idx)
94 [table_view_ 98 [table_view_
95 selectRowIndexes:[NSIndexSet indexSetWithIndex:selected_row - 1] 99 selectRowIndexes:[NSIndexSet indexSetWithIndex:selected_row - 1]
96 byExtendingSelection:NO]; 100 byExtendingSelection:NO];
97 101
98 UpdateTableView(); 102 UpdateTableView();
99 } 103 }
100 104
105 void TableViewController::AdapterOn() {}
106
107 void TableViewController::AdapterOff() {}
108
109 void TableViewController::Refresh() {}
110
111 void TableViewController::Idle() {}
112
101 void TableViewController::UpdateTableView() { 113 void TableViewController::UpdateTableView() {
102 [table_view_ setEnabled:chooser_controller_->NumOptions() > 0]; 114 [table_view_ setEnabled:chooser_controller_->NumOptions() > 0];
103 [table_view_ reloadData]; 115 [table_view_ reloadData];
104 } 116 }
105 117
106 @implementation ChooserContentViewCocoa 118 @implementation ChooserContentViewCocoa
107 119
108 - (instancetype)initWithChooserTitle:(NSString*)chooserTitle 120 - (instancetype)initWithChooserTitle:(NSString*)chooserTitle
109 chooserController: 121 chooserController:
110 (std::unique_ptr<ChooserController>)chooserController { 122 (std::unique_ptr<ChooserController>)chooserController {
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 373
362 - (void)close { 374 - (void)close {
363 chooserController_->Close(); 375 chooserController_->Close();
364 } 376 }
365 377
366 - (void)onHelpPressed:(id)sender { 378 - (void)onHelpPressed:(id)sender {
367 chooserController_->OpenHelpCenterUrl(); 379 chooserController_->OpenHelpCenterUrl();
368 } 380 }
369 381
370 @end 382 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698