diff options
| author | hshi@chromium.org <hshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 00:07:11 +0000 |
|---|---|---|
| committer | hshi@chromium.org <hshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 00:07:11 +0000 |
| commit | 1abfc2d388af53dce6b1f4baf29cb7ab0ead7a30 (patch) | |
| tree | 459137db290596699583a98796e495516d361f18 /ash/system/chromeos | |
| parent | b01b8039cd612d42d5f4c5063282b8dd1a3950fa (diff) | |
| download | chromium_src-1abfc2d388af53dce6b1f4baf29cb7ab0ead7a30.zip chromium_src-1abfc2d388af53dce6b1f4baf29cb7ab0ead7a30.tar.gz chromium_src-1abfc2d388af53dce6b1f4baf29cb7ab0ead7a30.tar.bz2 | |
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
Diffstat (limited to 'ash/system/chromeos')
| -rw-r--r-- | ash/system/chromeos/screen_security/screen_capture_tray_item.cc | 6 | ||||
| -rw-r--r-- | ash/system/chromeos/screen_security/screen_share_tray_item.cc | 6 |
2 files changed, 6 insertions, 6 deletions
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, |