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

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

Issue 10835041: Adding OOBE high DPI assets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update Created 8 years, 4 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 | 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/wifi_config_view.h" 5 #include "chrome/browser/chromeos/options/wifi_config_view.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/chromeos/cros/cros_library.h" 10 #include "chrome/browser/chromeos/cros/cros_library.h"
(...skipping 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 passphrase_visible_button_ = new views::ToggleImageButton(this); 1044 passphrase_visible_button_ = new views::ToggleImageButton(this);
1045 passphrase_visible_button_->SetTooltipText( 1045 passphrase_visible_button_->SetTooltipText(
1046 l10n_util::GetStringUTF16( 1046 l10n_util::GetStringUTF16(
1047 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_SHOW)); 1047 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_SHOW));
1048 passphrase_visible_button_->SetToggledTooltipText( 1048 passphrase_visible_button_->SetToggledTooltipText(
1049 l10n_util::GetStringUTF16( 1049 l10n_util::GetStringUTF16(
1050 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_HIDE)); 1050 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_HIDE));
1051 passphrase_visible_button_->SetImage( 1051 passphrase_visible_button_->SetImage(
1052 views::ImageButton::BS_NORMAL, 1052 views::ImageButton::BS_NORMAL,
1053 ResourceBundle::GetSharedInstance(). 1053 ResourceBundle::GetSharedInstance().
1054 GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD_OFF)); 1054 GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD));
1055 passphrase_visible_button_->SetImage( 1055 passphrase_visible_button_->SetImage(
1056 views::ImageButton::BS_HOT, 1056 views::ImageButton::BS_HOT,
1057 ResourceBundle::GetSharedInstance(). 1057 ResourceBundle::GetSharedInstance().
1058 GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD_HOVER)); 1058 GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD_HOVER));
1059 passphrase_visible_button_->SetToggledImage( 1059 passphrase_visible_button_->SetToggledImage(
1060 views::ImageButton::BS_NORMAL, 1060 views::ImageButton::BS_NORMAL,
1061 ResourceBundle::GetSharedInstance(). 1061 ResourceBundle::GetSharedInstance().
1062 GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD_ON)); 1062 GetImageSkiaNamed(IDR_NETWORK_HIDE_PASSWORD));
1063 passphrase_visible_button_->SetToggledImage(
1064 views::ImageButton::BS_HOT,
1065 ResourceBundle::GetSharedInstance().
1066 GetImageSkiaNamed(IDR_NETWORK_HIDE_PASSWORD_HOVER));
1063 passphrase_visible_button_->SetImageAlignment( 1067 passphrase_visible_button_->SetImageAlignment(
1064 views::ImageButton::ALIGN_CENTER, views::ImageButton::ALIGN_MIDDLE); 1068 views::ImageButton::ALIGN_CENTER, views::ImageButton::ALIGN_MIDDLE);
1065 layout->AddView(passphrase_visible_button_); 1069 layout->AddView(passphrase_visible_button_);
1066 } 1070 }
1067 1071
1068 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); 1072 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
1069 1073
1070 if (show_8021x) { 1074 if (show_8021x) {
1071 // Anonymous identity 1075 // Anonymous identity
1072 layout->StartRow(0, column_view_set_id); 1076 layout->StartRow(0, column_view_set_id);
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
1257 void WifiConfigView::ParseWiFiEAPUIProperty( 1261 void WifiConfigView::ParseWiFiEAPUIProperty(
1258 NetworkPropertyUIData* property_ui_data, 1262 NetworkPropertyUIData* property_ui_data,
1259 Network* network, 1263 Network* network,
1260 const std::string& key) { 1264 const std::string& key) {
1261 ParseWiFiUIProperty( 1265 ParseWiFiUIProperty(
1262 property_ui_data, network, 1266 property_ui_data, network,
1263 base::StringPrintf("%s.%s", onc::wifi::kEAP, key.c_str())); 1267 base::StringPrintf("%s.%s", onc::wifi::kEAP, key.c_str()));
1264 } 1268 }
1265 1269
1266 } // namespace chromeos 1270 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698