chrome/browser/extensions/active_script_controller.cc - Issue 481433005: Extensions: Move id_util functions to crx_file component.

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/active_script_controller.cc

Issue 481433005: Extensions: Move id_util functions to crx_file component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: revert last patchset. function returns Extension* and can't use an assert. Created 6 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/extensions/active_script_controller.cc

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

index d82290756cd6b89965108d96e6ff472750710535..6920b887f13bb81afe1ad0472fd0e42bdc1314bb 100644

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

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

@@ -19,6 +19,7 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/sessions/session_tab_helper.h"

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

+#include "components/crx_file/id_util.h"

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

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

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

@@ -269,7 +270,7 @@ void ActiveScriptController::OnRequestScriptInjectionPermission(

const std::string& extension_id,

UserScript::InjectionType script_type,

int64 request_id) {

- if (!Extension::IdIsValid(extension_id)) {

+ if (!crx_file::id_util::IdIsValid(extension_id)) {

NOTREACHED() << "'" << extension_id << "' is not a valid id.";

return;

}