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

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 unnecessary include file 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 OnAdapterEnabledChanged(bool enabled) override;
54 void OnRefreshStateChanged(bool refreshing) override;
53 55
54 void UpdateTableView(); 56 void UpdateTableView();
55 57
56 private: 58 private:
57 ChooserController* chooser_controller_; 59 ChooserController* chooser_controller_;
58 NSTableView* table_view_; 60 NSTableView* table_view_;
59 61
60 DISALLOW_COPY_AND_ASSIGN(TableViewController); 62 DISALLOW_COPY_AND_ASSIGN(TableViewController);
61 }; 63 };
62 64
(...skipping 28 matching lines...) Expand all
91 if (selected_row == idx) 93 if (selected_row == idx)
92 [table_view_ deselectRow:idx]; 94 [table_view_ deselectRow:idx];
93 else if (selected_row > idx) 95 else if (selected_row > idx)
94 [table_view_ 96 [table_view_
95 selectRowIndexes:[NSIndexSet indexSetWithIndex:selected_row - 1] 97 selectRowIndexes:[NSIndexSet indexSetWithIndex:selected_row - 1]
96 byExtendingSelection:NO]; 98 byExtendingSelection:NO];
97 99
98 UpdateTableView(); 100 UpdateTableView();
99 } 101 }
100 102
103 void TableViewController::OnAdapterEnabledChanged(bool enabled) {}
104
105 void TableViewController::OnRefreshStateChanged(bool refreshing) {}
106
101 void TableViewController::UpdateTableView() { 107 void TableViewController::UpdateTableView() {
102 [table_view_ setEnabled:chooser_controller_->NumOptions() > 0]; 108 [table_view_ setEnabled:chooser_controller_->NumOptions() > 0];
103 [table_view_ reloadData]; 109 [table_view_ reloadData];
104 } 110 }
105 111
106 @implementation ChooserContentViewCocoa 112 @implementation ChooserContentViewCocoa
107 113
108 - (instancetype)initWithChooserTitle:(NSString*)chooserTitle 114 - (instancetype)initWithChooserTitle:(NSString*)chooserTitle
109 chooserController: 115 chooserController:
110 (std::unique_ptr<ChooserController>)chooserController { 116 (std::unique_ptr<ChooserController>)chooserController {
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 367
362 - (void)close { 368 - (void)close {
363 chooserController_->Close(); 369 chooserController_->Close();
364 } 370 }
365 371
366 - (void)onHelpPressed:(id)sender { 372 - (void)onHelpPressed:(id)sender {
367 chooserController_->OpenHelpCenterUrl(); 373 chooserController_->OpenHelpCenterUrl();
368 } 374 }
369 375
370 @end 376 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/bluetooth/chrome_extension_bluetooth_chooser.cc ('k') | chrome/browser/ui/views/chooser_content_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698