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

Side by Side Diff: chrome/browser/chromeos/login/network_selection_view.cc

Issue 5990008: Remove wstring from l10n_util. Part 1.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/login/network_selection_view.h" 5 #include "chrome/browser/chromeos/login/network_selection_view.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <sys/types.h> 8 #include <sys/types.h>
9 #include <string> 9 #include <string>
10 10
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 proxy_settings_link_->SetVisible(true); 324 proxy_settings_link_->SetVisible(true);
325 proxy_settings_link_->SetFocusable(true); 325 proxy_settings_link_->SetFocusable(true);
326 proxy_settings_link_->SetNormalColor(login::kLinkColor); 326 proxy_settings_link_->SetNormalColor(login::kLinkColor);
327 proxy_settings_link_->SetHighlightedColor(login::kLinkColor); 327 proxy_settings_link_->SetHighlightedColor(login::kLinkColor);
328 328
329 UpdateLocalizedStrings(); 329 UpdateLocalizedStrings();
330 } 330 }
331 331
332 void NetworkSelectionView::UpdateLocalizedStrings() { 332 void NetworkSelectionView::UpdateLocalizedStrings() {
333 languages_menubutton_->SetText( 333 languages_menubutton_->SetText(
334 delegate_->language_switch_menu()->GetCurrentLocaleName()); 334 UTF16ToWide(delegate_->language_switch_menu()->GetCurrentLocaleName()));
335 keyboards_menubutton_->SetText( 335 keyboards_menubutton_->SetText(
336 delegate_->keyboard_switch_menu()->GetCurrentKeyboardName()); 336 UTF16ToWide(delegate_->keyboard_switch_menu()->GetCurrentKeyboardName()));
337 welcome_label_->SetText(l10n_util::GetString(IDS_NETWORK_SELECTION_TITLE)); 337 welcome_label_->SetText(l10n_util::GetString(IDS_NETWORK_SELECTION_TITLE));
338 select_language_label_->SetText( 338 select_language_label_->SetText(
339 l10n_util::GetString(IDS_LANGUAGE_SELECTION_SELECT)); 339 l10n_util::GetString(IDS_LANGUAGE_SELECTION_SELECT));
340 select_keyboard_label_->SetText( 340 select_keyboard_label_->SetText(
341 l10n_util::GetString(IDS_KEYBOARD_SELECTION_SELECT)); 341 l10n_util::GetString(IDS_KEYBOARD_SELECTION_SELECT));
342 select_network_label_->SetText( 342 select_network_label_->SetText(
343 l10n_util::GetString(IDS_NETWORK_SELECTION_SELECT)); 343 l10n_util::GetString(IDS_NETWORK_SELECTION_SELECT));
344 proxy_settings_link_->SetText( 344 proxy_settings_link_->SetText(
345 l10n_util::GetString(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON)); 345 l10n_util::GetString(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON));
346 RecreateNativeControls(); 346 RecreateNativeControls();
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 l10n_util::GetString(IDS_NETWORK_SELECTION_CONTINUE_BUTTON)); 451 l10n_util::GetString(IDS_NETWORK_SELECTION_CONTINUE_BUTTON));
452 continue_button_->SetEnabled(is_continue_enabled); 452 continue_button_->SetEnabled(is_continue_enabled);
453 } 453 }
454 454
455 void NetworkSelectionView::UpdateConnectingNetworkLabel() { 455 void NetworkSelectionView::UpdateConnectingNetworkLabel() {
456 connecting_network_label_->SetText(l10n_util::GetStringF( 456 connecting_network_label_->SetText(l10n_util::GetStringF(
457 IDS_NETWORK_SELECTION_CONNECTING, UTF16ToWide(network_id_))); 457 IDS_NETWORK_SELECTION_CONNECTING, UTF16ToWide(network_id_)));
458 } 458 }
459 459
460 } // namespace chromeos 460 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698