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

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

Issue 2061193003: Remove "BUBBLE" from chooser related string IDs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.h" 5 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.h"
6 6
7 #include "base/strings/sys_string_conversions.h" 7 #include "base/strings/sys_string_conversions.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #import "chrome/browser/ui/cocoa/chooser_content_view_cocoa.h" 9 #import "chrome/browser/ui/cocoa/chooser_content_view_cocoa.h"
10 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h" 10 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 if (extension) 42 if (extension)
43 chooserTitle = base::UTF8ToUTF16(extension->name()); 43 chooserTitle = base::UTF8ToUTF16(extension->name());
44 } 44 }
45 45
46 if (chooserTitle.empty()) { 46 if (chooserTitle.empty()) {
47 chooserTitle = url_formatter::FormatOriginForSecurityDisplay( 47 chooserTitle = url_formatter::FormatOriginForSecurityDisplay(
48 origin, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC); 48 origin, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC);
49 } 49 }
50 50
51 chooserContentView_.reset([[ChooserContentViewCocoa alloc] 51 chooserContentView_.reset([[ChooserContentViewCocoa alloc]
52 initWithChooserTitle:l10n_util::GetNSStringF(IDS_CHOOSER_BUBBLE_PROMPT, 52 initWithChooserTitle:l10n_util::GetNSStringF(IDS_CHOOSER_PROMPT,
53 chooserTitle)]); 53 chooserTitle)]);
54 54
55 tableView_ = [chooserContentView_ tableView]; 55 tableView_ = [chooserContentView_ tableView];
56 connectButton_ = [chooserContentView_ connectButton]; 56 connectButton_ = [chooserContentView_ connectButton];
57 cancelButton_ = [chooserContentView_ cancelButton]; 57 cancelButton_ = [chooserContentView_ cancelButton];
58 helpButton_ = [chooserContentView_ helpButton]; 58 helpButton_ = [chooserContentView_ helpButton];
59 59
60 [connectButton_ setTarget:self]; 60 [connectButton_ setTarget:self];
61 [connectButton_ setAction:@selector(onConnect:)]; 61 [connectButton_ setAction:@selector(onConnect:)];
62 [cancelButton_ setTarget:self]; 62 [cancelButton_ setTarget:self];
(...skipping 15 matching lines...) Expand all
78 static_cast<NSInteger>(1)); 78 static_cast<NSInteger>(1));
79 } 79 }
80 80
81 - (id)tableView:(NSTableView*)tableView 81 - (id)tableView:(NSTableView*)tableView
82 objectValueForTableColumn:(NSTableColumn*)tableColumn 82 objectValueForTableColumn:(NSTableColumn*)tableColumn
83 row:(NSInteger)rowIndex { 83 row:(NSInteger)rowIndex {
84 NSInteger num_options = 84 NSInteger num_options =
85 static_cast<NSInteger>(chooserController_->NumOptions()); 85 static_cast<NSInteger>(chooserController_->NumOptions());
86 if (num_options == 0) { 86 if (num_options == 0) {
87 DCHECK_EQ(0, rowIndex); 87 DCHECK_EQ(0, rowIndex);
88 return l10n_util::GetNSString(IDS_CHOOSER_BUBBLE_NO_DEVICES_FOUND_PROMPT); 88 return l10n_util::GetNSString(IDS_CHOOSER_NO_DEVICES_FOUND_PROMPT);
89 } 89 }
90 90
91 DCHECK_GE(rowIndex, 0); 91 DCHECK_GE(rowIndex, 0);
92 DCHECK_LT(rowIndex, num_options); 92 DCHECK_LT(rowIndex, num_options);
93 return base::SysUTF16ToNSString( 93 return base::SysUTF16ToNSString(
94 chooserController_->GetOption(static_cast<size_t>(rowIndex))); 94 chooserController_->GetOption(static_cast<size_t>(rowIndex)));
95 } 95 }
96 96
97 - (BOOL)tableView:(NSTableView*)aTableView 97 - (BOOL)tableView:(NSTableView*)aTableView
98 shouldEditTableColumn:(NSTableColumn*)aTableColumn 98 shouldEditTableColumn:(NSTableColumn*)aTableColumn
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 146
147 - (void)onHelpPressed:(id)sender { 147 - (void)onHelpPressed:(id)sender {
148 chooserController_->OpenHelpCenterUrl(); 148 chooserController_->OpenHelpCenterUrl();
149 } 149 }
150 150
151 - (ChooserContentViewCocoa*)chooserContentView { 151 - (ChooserContentViewCocoa*)chooserContentView {
152 return chooserContentView_.get(); 152 return chooserContentView_.get();
153 } 153 }
154 154
155 @end 155 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698