diff options
| author | rouslan@chromium.org <rouslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 00:43:46 +0000 |
|---|---|---|
| committer | rouslan@chromium.org <rouslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 00:43:46 +0000 |
| commit | 0ac7350ccad13435b0a34667e8f067b6d4e8a33c (patch) | |
| tree | 21fddfdf3926bd1253ab7d4a57f83ec43369f60c /ash | |
| parent | e63f3955c9ed25cc383d51a29dc3889c2375c323 (diff) | |
| download | chromium_src-0ac7350ccad13435b0a34667e8f067b6d4e8a33c.zip chromium_src-0ac7350ccad13435b0a34667e8f067b6d4e8a33c.tar.gz chromium_src-0ac7350ccad13435b0a34667e8f067b6d4e8a33c.tar.bz2 | |
Revert 246122 "Adds the new image for display notifications."
Broke ash_unittests on Win7 Tests (dbg)(1) (stats).
http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20(dbg)(1)
Some of the failed tests:
ResolutionNotificationControllerTest.Basic
ResolutionNotificationControllerTest.ClickMeansAccept
ResolutionNotificationControllerTest.AcceptButton
ResolutionNotificationControllerTest.Close
> Adds the new image for display notifications.
>
> BUG=254737
> R=oshima@chromium.org
> TEST=manually
>
> Review URL: https://codereview.chromium.org/141653004
TBR=mukai@chromium.org
Review URL: https://codereview.chromium.org/143803011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/display/display_error_observer_chromeos.cc | 2 | ||||
| -rw-r--r-- | ash/display/resolution_notification_controller.cc | 2 | ||||
| -rw-r--r-- | ash/resources/ash_resources.grd | 1 | ||||
| -rw-r--r-- | ash/resources/default_100_percent/cros/notification/display_notification_icon.png | bin | 274 -> 0 bytes | |||
| -rw-r--r-- | ash/resources/default_200_percent/cros/notification/display_notification_icon.png | bin | 458 -> 0 bytes | |||
| -rw-r--r-- | ash/system/chromeos/tray_display.cc | 2 |
6 files changed, 3 insertions, 4 deletions
diff --git a/ash/display/display_error_observer_chromeos.cc b/ash/display/display_error_observer_chromeos.cc index 5fe543c..f09a841 100644 --- a/ash/display/display_error_observer_chromeos.cc +++ b/ash/display/display_error_observer_chromeos.cc @@ -47,7 +47,7 @@ void DisplayErrorObserver::OnDisplayModeChangeFailed( kDisplayErrorNotificationId, l10n_util::GetStringUTF16(message_id), base::string16(), // message - bundle.GetImageNamed(IDR_AURA_NOTIFICATION_DISPLAY), + bundle.GetImageNamed(IDR_AURA_UBER_TRAY_DISPLAY), base::string16(), // display_source message_center::NotifierId( message_center::NotifierId::SYSTEM_COMPONENT, diff --git a/ash/display/resolution_notification_controller.cc b/ash/display/resolution_notification_controller.cc index 535a82f..b51065a 100644 --- a/ash/display/resolution_notification_controller.cc +++ b/ash/display/resolution_notification_controller.cc @@ -226,7 +226,7 @@ void ResolutionNotificationController::CreateOrUpdateNotification( GetDisplayNameForId(change_info_->display_id)), base::UTF8ToUTF16(change_info_->new_resolution.ToString())), timeout_message, - bundle.GetImageNamed(IDR_AURA_NOTIFICATION_DISPLAY), + bundle.GetImageNamed(IDR_AURA_UBER_TRAY_DISPLAY), base::string16() /* display_source */, message_center::NotifierId( message_center::NotifierId::SYSTEM_COMPONENT, diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd index 6dbb807..6807e43 100644 --- a/ash/resources/ash_resources.grd +++ b/ash/resources/ash_resources.grd @@ -156,7 +156,6 @@ <!-- ChromeOS specific icons --> <if expr="pp_ifdef('chromeos')"> <structure type="chrome_scaled_image" name="IDR_AURA_NOTIFICATION_LOW_POWER_CHARGER" file="cros/notification/notification_low_power_charger.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_NOTIFICATION_DISPLAY" file="cros/notification/display_notification_icon.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ENTERPRISE_DARK" file="cros/status/status_managed.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_MANAGED_USER" file="cros/status/status_managed_mode_user.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_1X" file="cros/network/statusbar_network_1x.png" /> diff --git a/ash/resources/default_100_percent/cros/notification/display_notification_icon.png b/ash/resources/default_100_percent/cros/notification/display_notification_icon.png Binary files differdeleted file mode 100644 index 7ded7aa..0000000 --- a/ash/resources/default_100_percent/cros/notification/display_notification_icon.png +++ /dev/null diff --git a/ash/resources/default_200_percent/cros/notification/display_notification_icon.png b/ash/resources/default_200_percent/cros/notification/display_notification_icon.png Binary files differdeleted file mode 100644 index ca326e2..0000000 --- a/ash/resources/default_200_percent/cros/notification/display_notification_icon.png +++ /dev/null diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc index 22e97f9..f468adc 100644 --- a/ash/system/chromeos/tray_display.cc +++ b/ash/system/chromeos/tray_display.cc @@ -380,7 +380,7 @@ void TrayDisplay::CreateOrUpdateNotification( kNotificationId, message, additional_message, - bundle.GetImageNamed(IDR_AURA_NOTIFICATION_DISPLAY), + bundle.GetImageNamed(IDR_AURA_UBER_TRAY_DISPLAY), base::string16(), // display_source message_center::NotifierId( message_center::NotifierId::SYSTEM_COMPONENT, |
