Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(62)

Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia (Closed)

Created:
8 years, 7 months ago by pkotwicz
Modified:
8 years, 7 months ago
Reviewers:
oshima, sky
CC:
chromium-reviews, asanka, jennb, sadrul, nkostylev+watch_chromium.org, ben+watch_chromium.org, tfarina, Dmitry Titov, dcheng, Randy Smith (Not in Mondays), Aaron Boodman, mihaip-chromium-reviews_chromium.org, jianli, stevenjb+watch_chromium.org, Andrei, davemoore+watch_chromium.org
Visibility:
Public.

Description

Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia The files were changed using the following sed script 1 :top 2 /SetImage/ { 3 s|ToSkBitmap|ToImageSkia|g 4 s|GetBitmapNamed|GetImageSkiaNamed|g 5 n 6 N 7 s|ToSkBitmap|ToImageSkia|g 8 s|GetBitmapNamed|GetImageSkiaNamed|g 9 b top 10 } 11 /SetBackground/ { 12 s|ToSkBitmap|ToImageSkia|g 13 s|GetBitmapNamed|GetImageSkiaNamed|g 14 n 15 N 16 s|ToSkBitmap|ToImageSkia|g 17 s|GetBitmapNamed|GetImageSkiaNamed|g 18 b top 19 } 20 /SetToggledImage/ { 21 s|ToSkBitmap|ToImageSkia|g 22 s|GetBitmapNamed|GetImageSkiaNamed|g 23 n 24 N 25 s|ToSkBitmap|ToImageSkia|g 26 s|GetBitmapNamed|GetImageSkiaNamed|g 27 b top 28 } The following files were modified by hand afterwards: 1 ash/launcher/launcher_button.cc 2 ash/system/audio/tray_volume.cc 3 ash/system/drive/tray_drive.cc 4 ash/system/tray/system_tray_delegate.h 5 ash/system/tray/tray_item_more.cc 6 ash/system/tray/tray_item_more.h 7 chrome/browser/chromeos/login/take_photo_view.cc 8 chrome/browser/chromeos/login/take_photo_view.h 9 chrome/browser/chromeos/options/network_config_view.cc 10 chrome/browser/chromeos/options/network_config_view.h 11 chrome/browser/ui/panels/panel_browser_frame_view.cc 12 chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc 13 chrome/browser/ui/views/autocomplete/autocomplete_result_view.h 14 chrome/browser/ui/views/avatar_menu_bubble_view.cc 15 chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc 16 chrome/browser/ui/views/confirm_bubble_view.cc 17 chrome/browser/ui/views/download/download_shelf_view.cc 18 chrome/browser/ui/views/download/download_started_animation_views.cc 19 chrome/browser/ui/views/dropdown_bar_view.cc 20 chrome/browser/ui/views/dropdown_bar_view.h 21 chrome/browser/ui/views/find_bar_view.cc 22 chrome/browser/ui/views/frame/opaque_browser_frame_view.cc 23 chrome/browser/ui/views/hung_renderer_view.cc 24 chrome/browser/ui/views/location_bar/page_action_image_view.cc 25 chrome/browser/ui/views/tabs/tab_strip.cc 26 chrome/browser/ui/views/tabs/tab_strip.h 27 ui/views/controls/button/image_button.h 28 ui/views/controls/button/image_button_unittest.cc 29 ui/views/controls/scrollbar/bitmap_scroll_bar.cc 30 ui/views/controls/scrollbar/bitmap_scroll_bar.h Whitespace changes were made in the following files manually 1 ash/launcher/launcher_view.cc 2 chrome/browser/chromeos/login/simple_web_view_dialog.cc 3 chrome/browser/ui/views/location_bar/chrome_to_mobile_view.cc 4 chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc 5 chrome/browser/ui/views/toolbar_view.cc Bug=124566 Test=Compiles, try bots pass Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=138072

Patch Set 1 #

Total comments: 2

Patch Set 2 : Fixed headers #

Patch Set 3 : Nicer diff #

Patch Set 4 : Rebased #

Unified diffs Side-by-side diffs Delta from patch set Stats (+301 lines, -277 lines) Patch
M ash/launcher/launcher_button.cc View 1 2 3 2 chunks +2 lines, -2 lines 0 comments Download
M ash/launcher/launcher_view.cc View 1 2 3 3 chunks +9 lines, -7 lines 0 comments Download
M ash/monitor/secondary_monitor_view.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/audio/tray_volume.cc View 1 chunk +3 lines, -3 lines 0 comments Download
M ash/system/bluetooth/tray_bluetooth.cc View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M ash/system/brightness/tray_brightness.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/drive/tray_drive.cc View 1 2 3 5 chunks +11 lines, -10 lines 0 comments Download
M ash/system/ime/tray_ime.cc View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M ash/system/network/tray_sms.cc View 1 2 3 3 chunks +4 lines, -4 lines 0 comments Download
M ash/system/settings/tray_settings.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/tray/system_tray_delegate.h View 1 2 3 2 chunks +2 lines, -3 lines 0 comments Download
M ash/system/tray/tray_image_item.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/tray/tray_item_more.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/tray/tray_item_more.cc View 1 2 3 2 chunks +3 lines, -3 lines 0 comments Download
M ash/system/tray/tray_views.cc View 1 2 3 2 chunks +5 lines, -5 lines 0 comments Download
M ash/system/tray_accessibility.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M ash/system/tray_caps_lock.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M ash/system/tray_update.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/wm/dialog_frame_view.cc View 1 chunk +3 lines, -3 lines 0 comments Download
M ash/wm/frame_painter.cc View 1 2 3 1 chunk +3 lines, -3 lines 0 comments Download
M chrome/browser/chromeos/login/message_bubble.cc View 1 chunk +3 lines, -3 lines 0 comments Download
M chrome/browser/chromeos/login/simple_web_view_dialog.cc View 1 2 3 1 chunk +17 lines, -15 lines 0 comments Download
M chrome/browser/chromeos/login/take_photo_view.h View 1 3 chunks +6 lines, -2 lines 0 comments Download
M chrome/browser/chromeos/login/take_photo_view.cc View 8 chunks +12 lines, -12 lines 0 comments Download
M chrome/browser/chromeos/options/network_config_view.h View 1 2 3 2 chunks +6 lines, -2 lines 0 comments Download
M chrome/browser/chromeos/options/network_config_view.cc View 1 2 3 1 chunk +2 lines, -2 lines 0 comments Download
M chrome/browser/chromeos/options/wifi_config_view.cc View 1 2 3 1 chunk +3 lines, -3 lines 0 comments Download
M chrome/browser/chromeos/options/wimax_config_view.cc View 1 2 3 1 chunk +3 lines, -3 lines 0 comments Download
M chrome/browser/first_run/try_chrome_dialog_view.cc View 2 chunks +4 lines, -4 lines 0 comments Download
M chrome/browser/ui/panels/panel_browser_frame_view.cc View 1 chunk +4 lines, -4 lines 0 comments Download
M chrome/browser/ui/tests/ui_gfx_image_unittest.cc View 1 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/browser/ui/views/autocomplete/autocomplete_result_view.h View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc View 1 2 3 2 chunks +2 lines, -3 lines 0 comments Download
M chrome/browser/ui/views/avatar_menu_bubble_view.cc View 1 2 3 1 chunk +2 lines, -2 lines 0 comments Download
M chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc View 1 2 3 1 chunk +2 lines, -1 line 0 comments Download
M chrome/browser/ui/views/collected_cookies_views.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/views/confirm_bubble_view.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M chrome/browser/ui/views/constrained_window_views.cc View 1 chunk +3 lines, -3 lines 0 comments Download
M chrome/browser/ui/views/create_application_shortcut_view.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/views/critical_notification_bubble_view.cc View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/views/download/download_shelf_view.cc View 1 2 3 3 chunks +6 lines, -6 lines 0 comments Download
M chrome/browser/ui/views/download/download_started_animation_views.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M chrome/browser/ui/views/dropdown_bar_view.h View 2 chunks +3 lines, -2 lines 0 comments Download
M chrome/browser/ui/views/dropdown_bar_view.cc View 4 chunks +9 lines, -8 lines 0 comments Download
M chrome/browser/ui/views/edit_search_engine_dialog.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M chrome/browser/ui/views/extensions/bundle_installed_bubble.cc View 1 chunk +3 lines, -3 lines 0 comments Download
M chrome/browser/ui/views/extensions/extension_installed_bubble.cc View 1 2 3 1 chunk +3 lines, -3 lines 0 comments Download
M chrome/browser/ui/views/find_bar_view.cc View 4 chunks +13 lines, -13 lines 0 comments Download
M chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc View 1 2 3 1 chunk +3 lines, -3 lines 0 comments Download
M chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc View 1 chunk +3 lines, -3 lines 0 comments Download
M chrome/browser/ui/views/frame/browser_frame_win.cc View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/views/frame/opaque_browser_frame_view.cc View 1 chunk +5 lines, -5 lines 0 comments Download
M chrome/browser/ui/views/global_error_bubble_view.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/views/hung_renderer_view.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M chrome/browser/ui/views/infobars/infobar_view.cc View 1 chunk +4 lines, -4 lines 0 comments Download
M chrome/browser/ui/views/location_bar/chrome_to_mobile_view.cc View 1 chunk +2 lines, -1 line 0 comments Download
M chrome/browser/ui/views/location_bar/content_setting_image_view.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc View 1 2 3 1 chunk +2 lines, -1 line 0 comments Download
M chrome/browser/ui/views/location_bar/location_bar_view.cc View 1 2 3 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/browser/ui/views/location_bar/page_action_image_view.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/views/location_bar/star_view.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/views/notifications/balloon_view.cc View 1 chunk +5 lines, -5 lines 0 comments Download
M chrome/browser/ui/views/sad_tab_view.cc View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/views/tabs/base_tab.cc View 1 2 3 1 chunk +3 lines, -3 lines 0 comments Download
M chrome/browser/ui/views/tabs/tab.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M chrome/browser/ui/views/tabs/tab_strip.h View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/views/tabs/tab_strip.cc View 1 2 3 2 chunks +3 lines, -3 lines 0 comments Download
M chrome/browser/ui/views/toolbar_view.cc View 1 2 3 1 chunk +22 lines, -18 lines 0 comments Download
M chrome/browser/ui/views/web_intent_picker_views.cc View 1 2 3 4 chunks +6 lines, -6 lines 0 comments Download
M chrome/browser/ui/views/wrench_menu.cc View 1 chunk +1 line, -1 line 0 comments Download
M ui/views/controls/button/image_button.h View 3 chunks +7 lines, -5 lines 0 comments Download
M ui/views/controls/button/image_button.cc View 3 chunks +11 lines, -10 lines 0 comments Download
M ui/views/controls/button/image_button_unittest.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M ui/views/controls/image_view.h View 1 3 chunks +4 lines, -3 lines 0 comments Download
M ui/views/controls/image_view.cc View 1 chunk +3 lines, -3 lines 0 comments Download
M ui/views/controls/scrollbar/bitmap_scroll_bar.h View 1 3 chunks +4 lines, -4 lines 0 comments Download
M ui/views/controls/scrollbar/bitmap_scroll_bar.cc View 2 chunks +12 lines, -12 lines 0 comments Download
M ui/views/examples/button_example.cc View 1 chunk +3 lines, -3 lines 0 comments Download
M ui/views/window/custom_frame_view.cc View 2 chunks +6 lines, -6 lines 0 comments Download

Messages

Total messages: 9 (0 generated)
pkotwicz
8 years, 7 months ago (2012-05-13 17:38:44 UTC) #1
sky
LGTM http://codereview.chromium.org/10382144/diff/1/ash/system/audio/tray_volume.cc File ash/system/audio/tray_volume.cc (right): http://codereview.chromium.org/10382144/diff/1/ash/system/audio/tray_volume.cc#newcode72 ash/system/audio/tray_volume.cc:72: gfx::ImageSkia image_skia; Code like this isn't going to ...
8 years, 7 months ago (2012-05-14 14:29:21 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/pkotwicz@chromium.org/10382144/13003
8 years, 7 months ago (2012-05-14 18:03:58 UTC) #3
pkotwicz
http://codereview.chromium.org/10382144/diff/1/ash/system/audio/tray_volume.cc File ash/system/audio/tray_volume.cc (right): http://codereview.chromium.org/10382144/diff/1/ash/system/audio/tray_volume.cc#newcode72 ash/system/audio/tray_volume.cc:72: gfx::ImageSkia image_skia; That's correct unfortunately.
8 years, 7 months ago (2012-05-14 18:04:05 UTC) #4
commit-bot: I haz the power
Change committed as 136964
8 years, 7 months ago (2012-05-14 20:22:09 UTC) #5
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/pkotwicz@chromium.org/10382144/15001
8 years, 7 months ago (2012-05-20 16:06:57 UTC) #6
commit-bot: I haz the power
Try job failure for 10382144-15001 (retry) on linux_rel for step "browser_tests". It's a second try, ...
8 years, 7 months ago (2012-05-20 17:24:04 UTC) #7
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/pkotwicz@chromium.org/10382144/15001
8 years, 7 months ago (2012-05-21 00:40:06 UTC) #8
commit-bot: I haz the power
8 years, 7 months ago (2012-05-21 01:54:56 UTC) #9
Change committed as 138072

Powered by Google App Engine
This is Rietveld 408576698