chrome/browser/extensions/extension_protocols.cc - Issue 11786003: Move Icons out of Extension class

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/extensions/extension_protocols.cc

Issue 11786003: Move Icons out of Extension class (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_browser_action

Patch Set: Created 7 years, 11 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:

Index: chrome/browser/extensions/extension_protocols.cc

diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc

index c26d7c0f1382c0493ba0509a3f4f6a63cd156763..6e1cbb344b752b57c9b5a1fd513e89fbfb013aff 100644

--- a/chrome/browser/extensions/extension_protocols.cc

+++ b/chrome/browser/extensions/extension_protocols.cc

@@ -21,6 +21,7 @@

#include "chrome/browser/extensions/image_loader.h"

#include "chrome/browser/net/chrome_url_request_context.h"

#include "chrome/common/chrome_paths.h"

+#include "chrome/common/extensions/api/icons/icons_handler.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_file_util.h"

#include "chrome/common/extensions/extension_resource.h"

@@ -295,7 +296,7 @@ bool URLIsForExtensionIcon(const GURL& url, const Extension* extension) {

DCHECK_EQ(url.host(), extension->id());

DCHECK(path.length() > 0 && path[0] == '/');

path = path.substr(1);

- return extension->icons().ContainsPath(path);

+ return extensions::IconsInfo::GetIcons(extension).ContainsPath(path);

}

class ExtensionProtocolHandler