From 21a83847941cc78dda68614e76bf1dd95d70e202 Mon Sep 17 00:00:00 2001
From: "tbarzic@chromium.org"
 <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 11 Jun 2014 13:40:37 +0000
Subject: Update bluetooth notification to use proper, 80px icon

Resource added in
https://codereview.chromium.org/322903004/

BUG=363644

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276382 0039d316-1c4b-4281-b951-d872f2087c98
---
 ash/resources/ash_resources.grd                                    | 1 +
 ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'ash')

diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd
index be48b67..4f0be18 100644
--- a/ash/resources/ash_resources.grd
+++ b/ash/resources/ash_resources.grd
@@ -104,6 +104,7 @@
 
       <!-- ChromeOS specific icons -->
       <if expr="chromeos">
+        <structure type="chrome_scaled_image" name="IDR_AURA_NOTIFICATION_BLUETOOTH" file="cros/notification/notification_bluetooth_icon.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_NOTIFICATION_LOW_POWER_CHARGER" file="cros/notification/notification_low_power_charger.png" />
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_AUDIO_BLUETOOTH" file="cros/status/status_audio_device_bluetooth.png" />
diff --git a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc
index 1965ac2..d6b38f4 100644
--- a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc
+++ b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc
@@ -297,7 +297,7 @@ void BluetoothNotificationController::NotifyAdapterDiscoverable() {
           IDS_ASH_STATUS_TRAY_BLUETOOTH_DISCOVERABLE,
           base::UTF8ToUTF16(adapter_->GetName()),
           base::UTF8ToUTF16(adapter_->GetAddress())),
-      bundle.GetImageNamed(IDR_AURA_UBER_TRAY_BLUETOOTH),
+      bundle.GetImageNamed(IDR_AURA_NOTIFICATION_BLUETOOTH),
       base::string16() /* display source */,
       message_center::NotifierId(
           message_center::NotifierId::SYSTEM_COMPONENT,
@@ -328,7 +328,7 @@ void BluetoothNotificationController::NotifyPairing(
       kBluetoothDevicePairingNotificationId,
       base::string16()  /* title */,
       message,
-      bundle.GetImageNamed(IDR_AURA_UBER_TRAY_BLUETOOTH),
+      bundle.GetImageNamed(IDR_AURA_NOTIFICATION_BLUETOOTH),
       base::string16()  /* display source */,
       message_center::NotifierId(
           message_center::NotifierId::SYSTEM_COMPONENT,
@@ -357,7 +357,7 @@ void BluetoothNotificationController::NotifyPairedDevice(
       base::string16() /* title */,
       l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_BLUETOOTH_PAIRED, device->GetName()),
-      bundle.GetImageNamed(IDR_AURA_UBER_TRAY_BLUETOOTH),
+      bundle.GetImageNamed(IDR_AURA_NOTIFICATION_BLUETOOTH),
       base::string16() /* display source */,
       message_center::NotifierId(
           message_center::NotifierId::SYSTEM_COMPONENT,
-- 
cgit v1.1