chrome/common/extensions/extension_file_util.cc - Issue 11644057: Move BrowserAction out of Extension

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 11644057: Move BrowserAction out of Extension (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_ungoop_extension_action

Patch Set: Combined ActionInfo wrappers Created 8 years 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 0a14fef566cbe63e3ba5ba26cf9a49908d38dae6..71eb34a15d8ea490d494b3615bdf4412a70f8d58 100644

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

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

@@ -20,6 +20,7 @@

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths.h"

#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/extension.h"

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

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

@@ -335,7 +336,7 @@ bool ValidateExtension(const Extension* extension,

return false;

}

- action = extension->browser_action_info();

+ action = extensions::ActionInfoData::GetBrowserActionInfo(extension);

if (action && !action->default_icon.empty() &&

!ValidateExtensionIconSet(action->default_icon, extension,

IDS_EXTENSION_LOAD_ICON_FOR_BROWSER_ACTION_FAILED, error)) {