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

Side by Side Diff: chrome/browser/history/top_sites_unittest.cc

Issue 10378009: Get rid of Image::Image(SkBitmap*) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: k Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/history/history_tab_helper.cc ('k') | chrome/browser/icon_loader_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/bind_helpers.h" 6 #include "base/bind_helpers.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/format_macros.h" 8 #include "base/format_macros.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/scoped_temp_dir.h" 10 #include "base/scoped_temp_dir.h"
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 // Gets the thumbnail for |url| from TopSites. 160 // Gets the thumbnail for |url| from TopSites.
161 SkBitmap GetThumbnail(const GURL& url) { 161 SkBitmap GetThumbnail(const GURL& url) {
162 scoped_refptr<base::RefCountedMemory> data; 162 scoped_refptr<base::RefCountedMemory> data;
163 return top_sites()->GetPageThumbnail(url, &data) ? 163 return top_sites()->GetPageThumbnail(url, &data) ?
164 ExtractThumbnail(*data.get()) : SkBitmap(); 164 ExtractThumbnail(*data.get()) : SkBitmap();
165 } 165 }
166 166
167 // Creates a bitmap of the specified color. Caller takes ownership. 167 // Creates a bitmap of the specified color. Caller takes ownership.
168 gfx::Image CreateBitmap(SkColor color) { 168 gfx::Image CreateBitmap(SkColor color) {
169 SkBitmap* thumbnail = new SkBitmap; 169 SkBitmap thumbnail;
170 thumbnail->setConfig(SkBitmap::kARGB_8888_Config, 4, 4); 170 thumbnail.setConfig(SkBitmap::kARGB_8888_Config, 4, 4);
171 thumbnail->allocPixels(); 171 thumbnail.allocPixels();
172 thumbnail->eraseColor(color); 172 thumbnail.eraseColor(color);
173 return gfx::Image(thumbnail); // takes ownership. 173 return gfx::Image(thumbnail); // adds ref.
174 } 174 }
175 175
176 // Forces top sites to load top sites from history, then recreates top sites. 176 // Forces top sites to load top sites from history, then recreates top sites.
177 // Recreating top sites makes sure the changes from history are saved and 177 // Recreating top sites makes sure the changes from history are saved and
178 // loaded from the db. 178 // loaded from the db.
179 void RefreshTopSitesAndRecreate() { 179 void RefreshTopSitesAndRecreate() {
180 StartQueryForMostVisited(); 180 StartQueryForMostVisited();
181 WaitForHistory(); 181 WaitForHistory();
182 RecreateTopSitesAndBlock(); 182 RecreateTopSitesAndBlock();
183 } 183 }
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
1238 ui_test_utils::WindowedNotificationObserver observer( 1238 ui_test_utils::WindowedNotificationObserver observer(
1239 chrome::NOTIFICATION_TOP_SITES_LOADED, 1239 chrome::NOTIFICATION_TOP_SITES_LOADED,
1240 content::Source<Profile>(profile())); 1240 content::Source<Profile>(profile()));
1241 profile()->CreateTopSites(); 1241 profile()->CreateTopSites();
1242 profile()->GetHistoryService(Profile::EXPLICIT_ACCESS)->UnloadBackend(); 1242 profile()->GetHistoryService(Profile::EXPLICIT_ACCESS)->UnloadBackend();
1243 profile()->BlockUntilHistoryProcessesPendingRequests(); 1243 profile()->BlockUntilHistoryProcessesPendingRequests();
1244 observer.Wait(); 1244 observer.Wait();
1245 } 1245 }
1246 1246
1247 } // namespace history 1247 } // namespace history
OLDNEW
« no previous file with comments | « chrome/browser/history/history_tab_helper.cc ('k') | chrome/browser/icon_loader_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698