chrome/browser/favicon/favicon_tab_helper.cc - Issue 10908114: Move SelectFaviconFrames from favicon/ to history/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/favicon/favicon_tab_helper.cc

Issue 10908114: Move SelectFaviconFrames from favicon/ to history/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 8 years, 3 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/favicon/favicon_service.cc ('k') | chrome/browser/favicon/favicon_util.cc » ('j') | no next file with comments »

OLD	NEW
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/favicon/favicon_service_factory.h"	8 #include "chrome/browser/favicon/favicon_service_factory.h"

9 #include "chrome/browser/favicon/favicon_util.h"	9 #include "chrome/browser/favicon/favicon_util.h"

10 #include "chrome/browser/favicon/select_favicon_frames.h"

11 #include "chrome/browser/history/history.h"	10 #include "chrome/browser/history/history.h"

12 #include "chrome/browser/history/history_service_factory.h"	11 #include "chrome/browser/history/history_service_factory.h"

	12 #include "chrome/browser/history/select_favicon_frames.h"

13 #include "chrome/browser/profiles/profile.h"	13 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/common/chrome_constants.h"	14 #include "chrome/common/chrome_constants.h"

15 #include "chrome/common/chrome_notification_types.h"	15 #include "chrome/common/chrome_notification_types.h"

16 #include "chrome/common/icon_messages.h"	16 #include "chrome/common/icon_messages.h"

17 #include "content/public/browser/favicon_status.h"	17 #include "content/public/browser/favicon_status.h"

18 #include "content/public/browser/invalidate_type.h"	18 #include "content/public/browser/invalidate_type.h"

19 #include "content/public/browser/navigation_controller.h"	19 #include "content/public/browser/navigation_controller.h"

20 #include "content/public/browser/navigation_details.h"	20 #include "content/public/browser/navigation_details.h"

21 #include "content/public/browser/navigation_entry.h"	21 #include "content/public/browser/navigation_entry.h"

22 #include "content/public/browser/notification_service.h"	22 #include "content/public/browser/notification_service.h"

(...skipping 180 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
203 scale_factors = ui::GetSupportedScaleFactors();	203 scale_factors = ui::GetSupportedScaleFactors();

204 gfx::Image favicon(SelectFaviconFrames(	204 gfx::Image favicon(SelectFaviconFrames(

205 bitmaps, scale_factors, requested_size, &score));	205 bitmaps, scale_factors, requested_size, &score));

206 favicon_handler_->OnDidDownloadFavicon(	206 favicon_handler_->OnDidDownloadFavicon(

207 id, image_url, errored, favicon, score);	207 id, image_url, errored, favicon, score);

208 if (touch_icon_handler_.get()) {	208 if (touch_icon_handler_.get()) {

209 touch_icon_handler_->OnDidDownloadFavicon(	209 touch_icon_handler_->OnDidDownloadFavicon(

210 id, image_url, errored, favicon, score);	210 id, image_url, errored, favicon, score);

211 }	211 }

212 }	212 }

OLD	NEW