diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-21 22:40:05 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-21 22:40:05 +0000 |
| commit | 074f105692a4783df43d1d1a68bb866a51e5b66b (patch) | |
| tree | 6b501cd44daebbf598dbda8c4496b78cfb6385bb /chrome/browser/dom_ui | |
| parent | 894bb50fe9a1b145221dd6993c159ab9f7a0fc5d (diff) | |
| download | chromium_src-074f105692a4783df43d1d1a68bb866a51e5b66b.zip chromium_src-074f105692a4783df43d1d1a68bb866a51e5b66b.tar.gz chromium_src-074f105692a4783df43d1d1a68bb866a51e5b66b.tar.bz2 | |
Make views/ depend only on images from app/resources.
Trying this again. All compile issues should be addressed, ui and unit tests now pass.
http://crbug.com/11387
Review URL: http://codereview.chromium.org/113690
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/dom_ui_favicon_source.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/dom_ui/dom_ui_favicon_source.cc b/chrome/browser/dom_ui/dom_ui_favicon_source.cc index 233bd83..bb7b9f0 100644 --- a/chrome/browser/dom_ui/dom_ui_favicon_source.cc +++ b/chrome/browser/dom_ui/dom_ui_favicon_source.cc @@ -7,7 +7,7 @@ #include "app/resource_bundle.h" #include "chrome/browser/profile.h" #include "chrome/common/url_constants.h" -#include "grit/theme_resources.h" +#include "grit/app_resources.h" DOMUIFavIconSource::DOMUIFavIconSource(Profile* profile) : DataSource(chrome::kChromeUIFavIconPath, MessageLoop::current()), diff --git a/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc b/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc index b62231c..2675049 100644 --- a/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc +++ b/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc @@ -54,11 +54,12 @@ TEST_F(DOMUISourcesTest, ThemeSourceMimeTypes) { TEST_F(DOMUISourcesTest, ThemeSourceImages) { // Our test data. Rather than comparing the data itself, we just compare // its size. - SkBitmap* image = ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_THEME_FRAME); + SkBitmap* image = ResourceBundle::GetSharedInstance().GetBitmapNamed( + IDR_THEME_FRAME_INCOGNITO); std::vector<unsigned char> png_bytes; PNGEncoder::EncodeBGRASkBitmap(*image, false, &png_bytes); - theme_source()->StartDataRequest("theme_frame", 1); + theme_source()->StartDataRequest("theme_frame_incognito", 1); EXPECT_EQ(theme_source()->result_request_id_, 1); EXPECT_EQ(theme_source()->result_data_size_, png_bytes.size()); |