chrome/common/extensions/extension_file_util.cc - Issue 11968032: Move 'theme' parsing 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/common/extensions/extension_file_util.cc

Issue 11968032: Move 'theme' parsing out of Extension class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: PrefProviderTest.Incognito fixed Created 7 years, 10 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/common/extensions/extension_file_util.cc

diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc

index 3ec7c9b8c346fafdfc913be0db9d43cc8e198c3e..96fedcdbeb516c51f5bd9526f22b0823256fc78f 100644

--- a/chrome/common/extensions/extension_file_util.cc

+++ b/chrome/common/extensions/extension_file_util.cc

@@ -22,6 +22,7 @@

#include "chrome/common/extensions/api/extension_action/action_info.h"

#include "chrome/common/extensions/api/extension_action/browser_action_handler.h"

#include "chrome/common/extensions/api/i18n/default_locale_handler.h"

+#include "chrome/common/extensions/api/themes/theme_handler.h"

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

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

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

@@ -266,7 +267,8 @@ bool ValidateExtension(const Extension* extension,

// Theme resource validation.

if (extension->is_theme()) {

- DictionaryValue* images_value = extension->GetThemeImages();

+ DictionaryValue* images_value =

+ extensions::ThemeInfo::GetThemeImages(extension);

if (images_value) {

for (DictionaryValue::Iterator iter(*images_value); !iter.IsAtEnd();

iter.Advance()) {