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

Side by Side Diff: chrome/browser/favicon/favicon_tab_helper.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
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 "chrome/browser/favicon/favicon_tab_helper.h" 5 #include "chrome/browser/favicon/favicon_tab_helper.h"
6 6
7 #include "chrome/browser/favicon/favicon_handler.h" 7 #include "chrome/browser/favicon/favicon_handler.h"
8 #include "chrome/browser/history/history.h" 8 #include "chrome/browser/history/history.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/common/chrome_constants.h" 10 #include "chrome/common/chrome_constants.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 IPC_MESSAGE_HANDLER(IconHostMsg_UpdateFaviconURL, OnUpdateFaviconURL) 179 IPC_MESSAGE_HANDLER(IconHostMsg_UpdateFaviconURL, OnUpdateFaviconURL)
180 IPC_MESSAGE_UNHANDLED(message_handled = false) 180 IPC_MESSAGE_UNHANDLED(message_handled = false)
181 IPC_END_MESSAGE_MAP() 181 IPC_END_MESSAGE_MAP()
182 return message_handled; 182 return message_handled;
183 } 183 }
184 184
185 void FaviconTabHelper::OnDidDownloadFavicon(int id, 185 void FaviconTabHelper::OnDidDownloadFavicon(int id,
186 const GURL& image_url, 186 const GURL& image_url,
187 bool errored, 187 bool errored,
188 const SkBitmap& image) { 188 const SkBitmap& image) {
189 gfx::Image favicon(new SkBitmap(image)); 189 gfx::Image favicon(image);
190 favicon_handler_->OnDidDownloadFavicon(id, image_url, errored, favicon); 190 favicon_handler_->OnDidDownloadFavicon(id, image_url, errored, favicon);
191 if (touch_icon_handler_.get()) 191 if (touch_icon_handler_.get())
192 touch_icon_handler_->OnDidDownloadFavicon(id, image_url, errored, favicon); 192 touch_icon_handler_->OnDidDownloadFavicon(id, image_url, errored, favicon);
193 } 193 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_install_ui.cc ('k') | chrome/browser/history/expire_history_backend_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698