chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc - Issue 11416179: Move chrome/common/favicon_url.(cc|h) into content/

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

Unified Diff: chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc

Issue 11416179: Move chrome/common/favicon_url.(cc|h) into content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 1 month ago

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

Jump to:

Index: chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc

diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc

index 468d7daba9dd727a85d8d8e3aa9741a14bd5dd9e..9a9adc44a2b0e1be2c0d9384087e160ccc87e80f 100644

--- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc

+++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc

@@ -8,14 +8,16 @@

#include "chrome/browser/favicon/favicon_download_helper.h"

#include "chrome/browser/favicon/favicon_download_helper_delegate.h"

#include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h"

-#include "chrome/common/favicon_url.h"

#include "chrome/common/icon_messages.h"

#include "content/public/browser/render_view_host.h"

#include "content/public/browser/web_contents.h"

#include "content/public/browser/web_contents_delegate.h"

+#include "content/public/common/favicon_url.h"

#include "googleurl/src/gurl.h"

#include "third_party/skia/include/core/SkBitmap.h"

+using content::FaviconURL;

namespace internal {

const int kMaxBitmapSize = 256;