diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 23:00:19 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 23:00:19 +0000 |
| commit | 32e7a9b5af36ff4c9288defd8c58c21b6217871b (patch) | |
| tree | 15c65f28d8f67c265a5013fb5d09a8c1fb36df0f /chrome/browser/bookmarks | |
| parent | 21f2e2d73211c9e155b8e33313c6d1a5b5a52add (diff) | |
| download | chromium_src-32e7a9b5af36ff4c9288defd8c58c21b6217871b.zip chromium_src-32e7a9b5af36ff4c9288defd8c58c21b6217871b.tar.gz chromium_src-32e7a9b5af36ff4c9288defd8c58c21b6217871b.tar.bz2 | |
Convert gfx::Image::Image(const SkBitmap&) and gfx::ImageSkia::ImageSkia(const SkBitmap&) to gfx::Image::CreateFrom1xBitmap(const SkBitmap&) and gfx::ImageSkia::CreateFrom1xBitmap(const SkBitmap&) respectively
Hopefully these changes will make the constructors / factory methods less confusing and prevent bugs as a result of confusion about what the constructors do.
Review URL: https://chromiumcodereview.appspot.com/11970013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_html_writer_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc index 5f1f72d..f4ed37e 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc @@ -200,7 +200,8 @@ TEST_F(BookmarkHTMLWriterTest, Test) { AddPage(url1, base::Time::Now(), history::SOURCE_BROWSED); FaviconServiceFactory::GetForProfile( &profile, Profile::EXPLICIT_ACCESS)->SetFavicons( - url1, url1_favicon, history::FAVICON, gfx::Image(bitmap)); + url1, url1_favicon, history::FAVICON, + gfx::Image::CreateFrom1xBitmap(bitmap)); message_loop.RunUntilIdle(); const BookmarkNode* f2 = model->AddFolder(f1, 1, f2_title); model->AddURLWithCreationTime(f2, 0, url2_title, url2, t2); |