diff options
| author | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 23:19:20 +0000 |
|---|---|---|
| committer | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 23:19:20 +0000 |
| commit | 654a5b7cfee5b592b1a6fa257b967d6fa45a345b (patch) | |
| tree | 807d9cb2cb1bd47e5da6f5d8824ebff72b8b43eb /chrome/browser/ui/tests/ui_gfx_image_unittest.cc | |
| parent | c996eaa91426041f6d6345c5e6247f0f56d6cfa6 (diff) | |
| download | chromium_src-654a5b7cfee5b592b1a6fa257b967d6fa45a345b.zip chromium_src-654a5b7cfee5b592b1a6fa257b967d6fa45a345b.tar.gz chromium_src-654a5b7cfee5b592b1a6fa257b967d6fa45a345b.tar.bz2 | |
Revert 136964 - 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
Review URL: https://chromiumcodereview.appspot.com/10382144
TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10388129
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137005 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/tests/ui_gfx_image_unittest.cc')
| -rw-r--r-- | chrome/browser/ui/tests/ui_gfx_image_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc index dedf6df..6640a63 100644 --- a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc +++ b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -30,7 +30,7 @@ TEST(UiGfxImageTest, ViewsImageView) { container->SetVisible(true); scoped_ptr<views::ImageView> image_view(new views::ImageView()); - image_view->SetImage(*image.ToImageSkia()); + image_view->SetImage(*image.ToSkBitmap()); container->AddChildView(image_view.get()); } #endif |