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

Side by Side Diff: chrome/browser/chromeos/options/network_config_view.cc

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/browser/chromeos/options/network_config_view.h" 5 #include "chrome/browser/chromeos/options/network_config_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 delete view; 149 delete view;
150 return; 150 return;
151 } 151 }
152 view->ShowDialog(parent); 152 view->ShowDialog(parent);
153 } 153 }
154 154
155 gfx::NativeWindow NetworkConfigView::GetNativeWindow() const { 155 gfx::NativeWindow NetworkConfigView::GetNativeWindow() const {
156 return GetWidget()->GetNativeWindow(); 156 return GetWidget()->GetNativeWindow();
157 } 157 }
158 158
159 string16 NetworkConfigView::GetDialogButtonLabel( 159 base::string16 NetworkConfigView::GetDialogButtonLabel(
160 ui::DialogButton button) const { 160 ui::DialogButton button) const {
161 if (button == ui::DIALOG_BUTTON_OK) 161 if (button == ui::DIALOG_BUTTON_OK)
162 return l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_CONNECT); 162 return l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_CONNECT);
163 return views::DialogDelegateView::GetDialogButtonLabel(button); 163 return views::DialogDelegateView::GetDialogButtonLabel(button);
164 } 164 }
165 165
166 bool NetworkConfigView::IsDialogButtonEnabled(ui::DialogButton button) const { 166 bool NetworkConfigView::IsDialogButtonEnabled(ui::DialogButton button) const {
167 // Disable connect button if cannot login. 167 // Disable connect button if cannot login.
168 if (button == ui::DIALOG_BUTTON_OK) 168 if (button == ui::DIALOG_BUTTON_OK)
169 return child_config_view_->CanLogin(); 169 return child_config_view_->CanLogin();
(...skipping 18 matching lines...) Expand all
188 } 188 }
189 189
190 views::View* NetworkConfigView::CreateExtraView() { 190 views::View* NetworkConfigView::CreateExtraView() {
191 return advanced_button_; 191 return advanced_button_;
192 } 192 }
193 193
194 views::View* NetworkConfigView::GetInitiallyFocusedView() { 194 views::View* NetworkConfigView::GetInitiallyFocusedView() {
195 return child_config_view_->GetInitiallyFocusedView(); 195 return child_config_view_->GetInitiallyFocusedView();
196 } 196 }
197 197
198 string16 NetworkConfigView::GetWindowTitle() const { 198 base::string16 NetworkConfigView::GetWindowTitle() const {
199 DCHECK(!child_config_view_->GetTitle().empty()); 199 DCHECK(!child_config_view_->GetTitle().empty());
200 return child_config_view_->GetTitle(); 200 return child_config_view_->GetTitle();
201 } 201 }
202 202
203 ui::ModalType NetworkConfigView::GetModalType() const { 203 ui::ModalType NetworkConfigView::GetModalType() const {
204 return ui::MODAL_TYPE_SYSTEM; 204 return ui::MODAL_TYPE_SYSTEM;
205 } 205 }
206 206
207 void NetworkConfigView::GetAccessibleState(ui::AccessibleViewState* state) { 207 void NetworkConfigView::GetAccessibleState(ui::AccessibleViewState* state) {
208 state->name = 208 state->name =
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 image_view_ = new views::ImageView(); 333 image_view_ = new views::ImageView();
334 // Disable |image_view_| so mouse events propagate to the parent. 334 // Disable |image_view_| so mouse events propagate to the parent.
335 image_view_->SetEnabled(false); 335 image_view_->SetEnabled(false);
336 image_view_->SetImage(image_); 336 image_view_->SetImage(image_);
337 image_view_->SetTooltipText( 337 image_view_->SetTooltipText(
338 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY)); 338 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY));
339 AddChildView(image_view_); 339 AddChildView(image_view_);
340 } 340 }
341 341
342 } // namespace chromeos 342 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/network_config_view.h ('k') | chrome/browser/chromeos/options/passphrase_textfield.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698