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

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

Issue 2620613005: Move more vector icons to respective directories and update code to (Closed)
Patch Set: Created 3 years, 11 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 (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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 passphrase_visible_button_->SetFocusForPlatform(); 1112 passphrase_visible_button_->SetFocusForPlatform();
1113 passphrase_visible_button_->set_request_focus_on_press(true); 1113 passphrase_visible_button_->set_request_focus_on_press(true);
1114 passphrase_visible_button_->SetTooltipText( 1114 passphrase_visible_button_->SetTooltipText(
1115 l10n_util::GetStringUTF16( 1115 l10n_util::GetStringUTF16(
1116 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_SHOW)); 1116 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_SHOW));
1117 passphrase_visible_button_->SetToggledTooltipText( 1117 passphrase_visible_button_->SetToggledTooltipText(
1118 l10n_util::GetStringUTF16( 1118 l10n_util::GetStringUTF16(
1119 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_HIDE)); 1119 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_HIDE));
1120 passphrase_visible_button_->SetImage( 1120 passphrase_visible_button_->SetImage(
1121 views::ImageButton::STATE_NORMAL, 1121 views::ImageButton::STATE_NORMAL,
1122 ResourceBundle::GetSharedInstance(). 1122 *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
1123 GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD)); 1123 IDR_NETWORK_SHOW_PASSWORD));
1124 passphrase_visible_button_->SetImage( 1124 passphrase_visible_button_->SetImage(
1125 views::ImageButton::STATE_HOVERED, 1125 views::ImageButton::STATE_HOVERED,
1126 ResourceBundle::GetSharedInstance(). 1126 *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
1127 GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD_HOVER)); 1127 IDR_NETWORK_SHOW_PASSWORD_HOVER));
1128 passphrase_visible_button_->SetToggledImage( 1128 passphrase_visible_button_->SetToggledImage(
1129 views::ImageButton::STATE_NORMAL, 1129 views::ImageButton::STATE_NORMAL,
1130 ResourceBundle::GetSharedInstance(). 1130 ResourceBundle::GetSharedInstance().
1131 GetImageSkiaNamed(IDR_NETWORK_HIDE_PASSWORD)); 1131 GetImageSkiaNamed(IDR_NETWORK_HIDE_PASSWORD));
1132 passphrase_visible_button_->SetToggledImage( 1132 passphrase_visible_button_->SetToggledImage(
1133 views::ImageButton::STATE_HOVERED, 1133 views::ImageButton::STATE_HOVERED,
1134 ResourceBundle::GetSharedInstance(). 1134 ResourceBundle::GetSharedInstance().
1135 GetImageSkiaNamed(IDR_NETWORK_HIDE_PASSWORD_HOVER)); 1135 GetImageSkiaNamed(IDR_NETWORK_HIDE_PASSWORD_HOVER));
1136 passphrase_visible_button_->SetImageAlignment( 1136 passphrase_visible_button_->SetImageAlignment(
1137 views::ImageButton::ALIGN_CENTER, views::ImageButton::ALIGN_MIDDLE); 1137 views::ImageButton::ALIGN_CENTER, views::ImageButton::ALIGN_MIDDLE);
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
1384 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data, 1384 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data,
1385 const NetworkState* network, 1385 const NetworkState* network,
1386 const std::string& key) { 1386 const std::string& key) {
1387 std::string onc_tag = network->type() == shill::kTypeEthernet 1387 std::string onc_tag = network->type() == shill::kTypeEthernet
1388 ? ::onc::ethernet::kEAP 1388 ? ::onc::ethernet::kEAP
1389 : ::onc::wifi::kEAP; 1389 : ::onc::wifi::kEAP;
1390 ParseUIProperty(property_ui_data, network, onc_tag + '.' + key); 1390 ParseUIProperty(property_ui_data, network, onc_tag + '.' + key);
1391 } 1391 }
1392 1392
1393 } // namespace chromeos 1393 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/resources/vector_icons/window_control_right_snapped.1x.icon ('k') | chrome/browser/chromeos/options/wimax_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698