Index: chrome/browser/chrome_webusb_browser_client.cc |
diff --git a/chrome/browser/chrome_webusb_browser_client.cc b/chrome/browser/chrome_webusb_browser_client.cc |
index ddfcd58916583b8f203629377e5c9369fc7e833f..8e736013ea328fcc88bc29f4f651681cc6e477ea 100644 |
--- a/chrome/browser/chrome_webusb_browser_client.cc |
+++ b/chrome/browser/chrome_webusb_browser_client.cc |
@@ -12,8 +12,10 @@ |
#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
#include "chrome/grit/generated_resources.h" |
#include "content/public/common/origin_util.h" |
+#include "grit/theme_resources.h" |
Lei Zhang
2015/10/30 22:22:09
chrome/grit/theme_resources.h ?
Reilly Grant (use Gerrit)
2015/10/30 22:33:15
I guess something is putting chrome in the include
oshima
2015/10/30 22:50:47
This is generated file.
I believe grit/theme_reso
Lei Zhang
2015/10/31 00:50:36
Yes, there's a bug to fix all the grit/ ones, but
|
#include "ui/base/l10n/l10n_util.h" |
#include "ui/base/page_transition_types.h" |
+#include "ui/base/resource/resource_bundle.h" |
#include "ui/base/window_open_disposition.h" |
#include "ui/gfx/image/image.h" |
#include "ui/message_center/message_center.h" |
@@ -74,6 +76,7 @@ void ChromeWebUsbBrowserClient::OnDeviceAdded( |
return; |
} |
+ ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
message_center::RichNotificationData rich_notification_data; |
scoped_ptr<message_center::Notification> notification( |
new message_center::Notification( |
@@ -83,8 +86,8 @@ void ChromeWebUsbBrowserClient::OnDeviceAdded( |
l10n_util::GetStringFUTF16( |
IDS_WEBUSB_DEVICE_DETECTED_NOTIFICATION, |
base::UTF8ToUTF16(landing_page.GetContent())), |
- // TODO(juncai): use generic USB device icon here. |
- gfx::Image(), base::string16(), GURL(), |
+ rb.GetNativeImageNamed(IDR_USB_NOTIFICATION_ICON), |
+ base::string16(), GURL(), |
message_center::NotifierId( |
message_center::NotifierId::SYSTEM_COMPONENT, |
kWebUsbDetectorNotificationID), |