diff options
author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 16:23:02 +0000 |
---|---|---|
committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 16:23:02 +0000 |
commit | 9938b1709e2639b0b2becb2ee6df0001af6c5383 (patch) | |
tree | da1a97f6f73bb885854ce2297ad6d59a9803c15e /chrome/browser/status_icons | |
parent | 1dde36363bcf351fd04f06df6b6efd6216391e31 (diff) | |
download | chromium_src-9938b1709e2639b0b2becb2ee6df0001af6c5383.zip chromium_src-9938b1709e2639b0b2becb2ee6df0001af6c5383.tar.gz chromium_src-9938b1709e2639b0b2becb2ee6df0001af6c5383.tar.bz2 |
Revert 140531 - Converted the rest of chrome except for extensions and favicons to user ImageSkia
Used same conversion script as 10437006
Modified the following files afterwards:
1 chrome/browser/background/background_application_list_model.cc
2 chrome/browser/extensions/extension_install_ui.cc
3 chrome/browser/extensions/extension_install_ui.h
4 chrome/browser/speech/speech_recognition_bubble.cc
5 chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc
6 chrome/browser/speech/speech_recognition_bubble_gtk.cc
7 chrome/browser/speech/speech_recognition_tray_icon_controller.h
8 chrome/browser/task_manager/task_manager_resource_providers.cc
9 chrome/browser/ui/panels/panel_browser_frame_view.cc
10 chrome/browser/ui/search_engines/template_url_table_model.cc
11 chrome/browser/ui/search_engines/template_url_table_model.h
12 chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
13 chrome/browser/ui/views/avatar_menu_button.cc
14 chrome/browser/ui/views/detachable_toolbar_view.cc
15 chrome/browser/ui/views/download/download_item_view.cc
16 chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
17 chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
18 chrome/browser/ui/views/location_bar/location_bar_view.cc
19 chrome/browser/ui/views/tab_icon_view.cc
20 chrome/browser/ui/views/tab_icon_view.h
21 chrome/browser/ui/views/tabs/tab_strip.cc
Include, whitespace changes in
1 chrome/browser/automation/automation_provider_observers.cc
2 chrome/browser/background/background_application_list_model.h
3 chrome/browser/background/background_mode_manager.cc
4 chrome/browser/custom_home_pages_table_model.h
5 chrome/browser/download/download_util.cc
6 chrome/browser/extensions/extension_function_dispatcher.cc
7 chrome/browser/extensions/extension_install_dialog.cc
8 chrome/browser/extensions/extension_install_dialog.h
9 chrome/browser/ntp_background_util.cc
10 chrome/browser/speech/speech_recognition_bubble.h
11 chrome/browser/task_manager/task_manager.h
12 chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc
13 chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.cc
14 chrome/browser/ui/cocoa/task_manager_mac.h
15 chrome/browser/ui/views/about_chrome_view.cc
16 chrome/browser/ui/views/avatar_menu_bubble_view.cc
17 chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
18 chrome/browser/ui/views/download/download_item_view.h
19 chrome/browser/ui/views/find_bar_view.cc
20 chrome/browser/ui/views/infobars/extension_infobar.cc
21 chrome/browser/ui/views/notifications/balloon_view.cc
22 chrome/browser/ui/views/page_info_bubble_view.cc
23 chrome/browser/ui/views/tabs/base_tab.cc
24 chrome/browser/ui/views/tabs/tab.cc
25 chrome/browser/ui/views/toolbar_view.cc
Review URL: https://chromiumcodereview.appspot.com/10453101
TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10534009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/status_icons')
-rw-r--r-- | chrome/browser/status_icons/desktop_notification_balloon.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/status_icons/desktop_notification_balloon.cc b/chrome/browser/status_icons/desktop_notification_balloon.cc index 70d46ee..a3fc825 100644 --- a/chrome/browser/status_icons/desktop_notification_balloon.cc +++ b/chrome/browser/status_icons/desktop_notification_balloon.cc @@ -15,7 +15,6 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/webui/web_ui_util.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/gfx/image/image_skia.h" namespace { @@ -73,7 +72,7 @@ void DesktopNotificationBalloon::DisplayBalloon(const SkBitmap& icon, const string16& contents) { GURL icon_url; if (!icon.empty()) - icon_url = GURL(web_ui_util::GetImageDataUrl(gfx::ImageSkia(icon))); + icon_url = GURL(web_ui_util::GetImageDataUrl(icon)); GURL content_url(DesktopNotificationService::CreateDataUrl( icon_url, title, contents, WebKit::WebTextDirectionDefault)); |