Adding OOBE high DPI assets

BUG=131177, 132773
TEST=manual, units

Review URL: https://chromiumcodereview.appspot.com/10835041

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149608 0039d316-1c4b-4281-b951-d872f2087c98

chrome/app/theme/theme_resources.grd

@@ -279,9 +279,9 @@
       </if>
       <if expr="pp_ifdef('chromeos')">
         <structure type="chrome_scaled_image" name="IDR_ICON_ADD_USER24" file="icon_add_user24.png" />
-        <structure type="chrome_scaled_image" name="IDR_ICON_ADD_USER24_WHITE" file="icon_add_user24_white.png" />
+        <structure type="chrome_scaled_image" name="IDR_ICON_ADD_USER_WHITE" file="icon_add_user_white.png" />
         <structure type="chrome_scaled_image" name="IDR_ICON_POWER24" file="icon_power24.png" />
-        <structure type="chrome_scaled_image" name="IDR_ICON_POWER24_WHITE" file="icon_power24_white.png" />
+        <structure type="chrome_scaled_image" name="IDR_ICON_POWER_WHITE" file="icon_power_white.png" />
       </if>
       <if expr="is_win">
         <structure type="chrome_scaled_image" name="IDR_INCOGNITO_SWITCH_OFF" file="incognito_switch_off.png" />
@@ -411,9 +411,10 @@
       <structure type="chrome_scaled_image" name="IDR_MOBILE" file="mobile.png" />
       <structure type="chrome_scaled_image" name="IDR_MOBILE_LIT" file="mobile_lit.png" />
       <if expr="pp_ifdef('chromeos')">
+        <structure type="chrome_scaled_image" name="IDR_NETWORK_HIDE_PASSWORD" file="network_hide_password.png" />
+        <structure type="chrome_scaled_image" name="IDR_NETWORK_HIDE_PASSWORD_HOVER" file="network_hide_password_hover.png" />
+        <structure type="chrome_scaled_image" name="IDR_NETWORK_SHOW_PASSWORD" file="network_show_password.png" />
         <structure type="chrome_scaled_image" name="IDR_NETWORK_SHOW_PASSWORD_HOVER" file="network_show_password_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_NETWORK_SHOW_PASSWORD_OFF" file="network_show_password_off.png" />
-        <structure type="chrome_scaled_image" name="IDR_NETWORK_SHOW_PASSWORD_ON" file="network_show_password_on.png" />
       </if>
       <if expr="not pp_ifdef('toolkit_views')">
         <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON" file="newtab.png" />

chrome/browser/chromeos/options/wifi_config_view.cc

@@ -1051,7 +1051,7 @@ void WifiConfigView::Init(WifiNetwork* wifi, bool show_8021x) {
     passphrase_visible_button_->SetImage(
         views::ImageButton::BS_NORMAL,
         ResourceBundle::GetSharedInstance().
-        GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD_OFF));
+        GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD));
     passphrase_visible_button_->SetImage(
         views::ImageButton::BS_HOT,
         ResourceBundle::GetSharedInstance().
@@ -1059,7 +1059,11 @@ void WifiConfigView::Init(WifiNetwork* wifi, bool show_8021x) {
     passphrase_visible_button_->SetToggledImage(
         views::ImageButton::BS_NORMAL,
         ResourceBundle::GetSharedInstance().
-        GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD_ON));
+        GetImageSkiaNamed(IDR_NETWORK_HIDE_PASSWORD));
+    passphrase_visible_button_->SetToggledImage(
+        views::ImageButton::BS_HOT,
+        ResourceBundle::GetSharedInstance().
+        GetImageSkiaNamed(IDR_NETWORK_HIDE_PASSWORD_HOVER));
     passphrase_visible_button_->SetImageAlignment(
         views::ImageButton::ALIGN_CENTER, views::ImageButton::ALIGN_MIDDLE);
     layout->AddView(passphrase_visible_button_);

chrome/browser/chromeos/options/wimax_config_view.cc

@@ -267,7 +267,7 @@ void WimaxConfigView::Init(WimaxNetwork* wimax) {
     passphrase_visible_button_->SetImage(
         views::ImageButton::BS_NORMAL,
         ResourceBundle::GetSharedInstance().
-        GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD_OFF));
+        GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD));
     passphrase_visible_button_->SetImage(
         views::ImageButton::BS_HOT,
         ResourceBundle::GetSharedInstance().
@@ -275,7 +275,11 @@ void WimaxConfigView::Init(WimaxNetwork* wimax) {
     passphrase_visible_button_->SetToggledImage(
         views::ImageButton::BS_NORMAL,
         ResourceBundle::GetSharedInstance().
-        GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD_ON));
+        GetImageSkiaNamed(IDR_NETWORK_HIDE_PASSWORD));
+    passphrase_visible_button_->SetToggledImage(
+        views::ImageButton::BS_HOT,
+        ResourceBundle::GetSharedInstance().
+        GetImageSkiaNamed(IDR_NETWORK_HIDE_PASSWORD_HOVER));
     passphrase_visible_button_->SetImageAlignment(
         views::ImageButton::ALIGN_CENTER, views::ImageButton::ALIGN_MIDDLE);
     layout->AddView(passphrase_visible_button_);

chrome/browser/resources/chromeos/login/header_bar.css

@@ -87,7 +87,9 @@ html[dir=rtl] #login-header-bar #add-user-button {
 }
 
 html[oobe=new] #login-header-bar #shutdown-button {
-  background-image: url('chrome://theme/IDR_ICON_POWER24_WHITE');
+  background-image: -webkit-image-set(
+      url('chrome://theme/IDR_ICON_POWER_WHITE') 1x,
+      url('chrome://theme/IDR_ICON_POWER_WHITE@2x') 2x);
 }
 
 #login-header-bar #add-user-button {
@@ -96,5 +98,7 @@ html[oobe=new] #login-header-bar #shutdown-button {
 }
 
 html[oobe=new] #login-header-bar #add-user-button {
-  background-image: url('chrome://theme/IDR_ICON_ADD_USER24_WHITE');
+  background-image: -webkit-image-set(
+      url('chrome://theme/IDR_ICON_ADD_USER_WHITE') 1x,
+      url('chrome://theme/IDR_ICON_ADD_USER_WHITE@2x') 2x);
 }