Update UI assets for screen capture and screen sharing.

Remove the "IDR_AURA_UBER_TRAY_DISPLAY_LIGHT" icons because they are no longer used anywhere.

BUG=327821
TEST=verified on device that the correct assets are used: screen capture/sharing uses the screenshare icons, and extended display uses the multi-display status icons.
R=oshima@chromium.org

Review URL: https://codereview.chromium.org/113423003

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

5 files changed, 8 insertions, 7 deletions

diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd
index 6fec31b..b68b587 100644
--- a/ash/resources/ash_resources.grd
+++ b/ash/resources/ash_resources.grd
@@ -90,7 +90,6 @@
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="cros/network/status_cellular_enabled.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="cros/network/status_cellular_enabled_hover.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DISPLAY" file="cros/status/status_display_dark.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DISPLAY_LIGHT" file="cros/status/status_display.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE" file="cros/status/status_drive.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="cros/status/status_drive_item_cancel.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="cros/status/status_drive_item_cancel_hover.png" />
@@ -139,6 +138,8 @@
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="cros/status/status_power_small_all_dark.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL_CHARGING_UNRELIABLE" file="cros/status/status_power_small_all_fluctuating.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL_CHARGING_UNRELIABLE_DARK" file="cros/status/status_power_small_all_dark_fluctuating.png" />
+      <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SCREENSHARE" file="cros/status/status_screenshare.png" />
+      <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SCREENSHARE_DARK" file="cros/status/status_screenshare_dark.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SESSION_LENGTH_LIMIT_TIMER" file="cros/status/status_session_length_limit_timer.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" file="cros/status/status_settings.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="cros/status/status_shutdown.png" />
diff --git a/ash/resources/default_100_percent/cros/status/status_display.png b/ash/resources/default_100_percent/cros/status/status_display.png
deleted file mode 100644
index df3f63d..0000000
--- a/ash/resources/default_100_percent/cros/status/status_display.png
+++ /dev/null
diff --git a/ash/resources/default_200_percent/cros/status/status_display.png b/ash/resources/default_200_percent/cros/status/status_display.png
deleted file mode 100644
index b89a120..0000000
--- a/ash/resources/default_200_percent/cros/status/status_display.png
+++ /dev/null
diff --git a/ash/system/chromeos/screen_security/screen_capture_tray_item.cc b/ash/system/chromeos/screen_security/screen_capture_tray_item.cc
index 0bba2b2..92e9309 100644
--- a/ash/system/chromeos/screen_security/screen_capture_tray_item.cc
+++ b/ash/system/chromeos/screen_security/screen_capture_tray_item.cc
@@ -36,7 +36,7 @@ ScreenCaptureTrayItem::~ScreenCaptureTrayItem() {
 
 views::View* ScreenCaptureTrayItem::CreateTrayView(user::LoginStatus status) {
   set_tray_view(
-      new tray::ScreenTrayView(this, IDR_AURA_UBER_TRAY_DISPLAY_LIGHT));
+      new tray::ScreenTrayView(this, IDR_AURA_UBER_TRAY_SCREENSHARE));
   return tray_view();
 }
 
@@ -44,7 +44,7 @@ views::View* ScreenCaptureTrayItem::CreateDefaultView(
     user::LoginStatus status) {
   set_default_view(new tray::ScreenStatusView(
       this,
-      IDR_AURA_UBER_TRAY_DISPLAY,
+      IDR_AURA_UBER_TRAY_SCREENSHARE_DARK,
       screen_capture_status_,
       l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_SCREEN_CAPTURE_STOP)));
@@ -61,7 +61,7 @@ void ScreenCaptureTrayItem::CreateOrUpdateNotification() {
       kScreenCaptureNotificationId,
       screen_capture_status_,
       base::string16() /* body is blank */,
-      resource_bundle.GetImageNamed(IDR_AURA_UBER_TRAY_DISPLAY),
+      resource_bundle.GetImageNamed(IDR_AURA_UBER_TRAY_SCREENSHARE_DARK),
       base::string16() /* display_source */,
       message_center::NotifierId(
           message_center::NotifierId::SYSTEM_COMPONENT,
diff --git a/ash/system/chromeos/screen_security/screen_share_tray_item.cc b/ash/system/chromeos/screen_security/screen_share_tray_item.cc
index bceae59..93d858a 100644
--- a/ash/system/chromeos/screen_security/screen_share_tray_item.cc
+++ b/ash/system/chromeos/screen_security/screen_share_tray_item.cc
@@ -36,14 +36,14 @@ ScreenShareTrayItem::~ScreenShareTrayItem() {
 
 views::View* ScreenShareTrayItem::CreateTrayView(user::LoginStatus status) {
   set_tray_view(
-      new tray::ScreenTrayView(this, IDR_AURA_UBER_TRAY_DISPLAY_LIGHT));
+      new tray::ScreenTrayView(this, IDR_AURA_UBER_TRAY_SCREENSHARE));
   return tray_view();
 }
 
 views::View* ScreenShareTrayItem::CreateDefaultView(user::LoginStatus status) {
   set_default_view(new tray::ScreenStatusView(
       this,
-      IDR_AURA_UBER_TRAY_DISPLAY,
+      IDR_AURA_UBER_TRAY_SCREENSHARE_DARK,
       l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_SCREEN_SHARE_BEING_HELPED),
       l10n_util::GetStringUTF16(
@@ -71,7 +71,7 @@ void ScreenShareTrayItem::CreateOrUpdateNotification() {
       kScreenShareNotificationId,
       help_label_text,
       base::string16() /* body is blank */,
-      resource_bundle.GetImageNamed(IDR_AURA_UBER_TRAY_DISPLAY),
+      resource_bundle.GetImageNamed(IDR_AURA_UBER_TRAY_SCREENSHARE_DARK),
       base::string16() /* display_source */,
       message_center::NotifierId(
           message_center::NotifierId::SYSTEM_COMPONENT,