chrome/browser/ui/webui/extensions/extension_settings_handler.cc - Issue 10843014: Generalize ExtensionIconSet to store icon paths for custom size sets

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

Issue 10843014: Generalize ExtensionIconSet to store icon paths for custom size sets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 4 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/ui/webui/extensions/extension_settings_handler.cc

diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc

index c1ffe6446c71feaa8794a6eef86b3c9e7acddb36..163ffdf3b8cf918fd8e800834fb2462fbebc9f75 100644

--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc

+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc

@@ -37,6 +37,7 @@

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

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

+#include "chrome/common/extensions/extension_constants.h"

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

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

#include "chrome/common/pref_names.h"

@@ -115,7 +116,7 @@ DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(

GURL icon =

ExtensionIconSource::GetIconURL(extension,

- ExtensionIconSet::EXTENSION_ICON_MEDIUM,

+ extension_misc::EXTENSION_ICON_MEDIUM,

ExtensionIconSet::MATCH_BIGGER,

!enabled, NULL);

if (extension->location() == Extension::LOAD)