diff options
| author | dewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 06:36:59 +0000 |
|---|---|---|
| committer | dewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 06:36:59 +0000 |
| commit | acf883a85d1bafb447d4c4ebae4687da988bf1cc (patch) | |
| tree | db1a3581153dad897217b0a47ff0594ff922a71b /ash | |
| parent | a6d0eaab927118f866c1418ac038aecf5337b826 (diff) | |
| download | chromium_src-acf883a85d1bafb447d4c4ebae4687da988bf1cc.zip chromium_src-acf883a85d1bafb447d4c4ebae4687da988bf1cc.tar.gz chromium_src-acf883a85d1bafb447d4c4ebae4687da988bf1cc.tar.bz2 | |
Make notifications API send bitmaps instead of data URLs to the browser.
Currently we encode the image data downloaded from the net as a data
URL, which still needs to be sent back to a renderer to be converted
into a bitmap. This patch sends over an ImageData object which is
ready to be put into an SkBitmap (with a RGBA->ARGB conversion).
TBR=sky@chromium.org - Changes for ash/ tests with notifications
BUG=238823,232288,168943
Review URL: https://chromiumcodereview.appspot.com/15927043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206009 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell/window_type_launcher.cc | 2 | ||||
| -rw-r--r-- | ash/system/web_notification/web_notification_tray_unittest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc index 2d67521..f87250d 100644 --- a/ash/shell/window_type_launcher.cc +++ b/ash/shell/window_type_launcher.cc @@ -356,7 +356,7 @@ void WindowTypeLauncher::ButtonPressed(views::Button* sender, gfx::Image(), ASCIIToUTF16("www.testshell.org"), "" /* extension id */, - NULL /* optional_fields */, + message_center::RichNotificationData(), NULL /* delegate */)); ash::Shell::GetPrimaryRootWindowController()->shelf()->status_area_widget() diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc index 71dfc40..1e8dca6 100644 --- a/ash/system/web_notification/web_notification_tray_unittest.cc +++ b/ash/system/web_notification/web_notification_tray_unittest.cc @@ -65,7 +65,7 @@ class WebNotificationTrayTest : public test::AshTestBase { gfx::Image(), ASCIIToUTF16("www.test.org"), "" /* extension id */, - NULL /* optional_fields */, + message_center::RichNotificationData(), NULL /* delegate */)); GetMessageCenter()->AddNotification(notification.Pass()); } @@ -81,7 +81,7 @@ class WebNotificationTrayTest : public test::AshTestBase { gfx::Image(), ASCIIToUTF16("www.test.org"), "" /* extension id */, - NULL /* optional_fields */, + message_center::RichNotificationData(), NULL /* delegate */)); GetMessageCenter()->UpdateNotification(old_id, notification.Pass()); } |