chrome/browser/guest_view/extension_options/extension_options_guest.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/guest_view/extension_options/extension_options_guest.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/webstore_standalone_installer.cc ('k') | chrome/browser/media_galleries/media_galleries_preferences.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/guest_view/extension_options/extension_options_guest.cc

diff --git a/chrome/browser/guest_view/extension_options/extension_options_guest.cc b/chrome/browser/guest_view/extension_options/extension_options_guest.cc

index f7ca2908f72de01663b09ff9edfdecbc4ea2d6c1..43553ac2f5ee304f19f4b1217f377da35340a619 100644

--- a/chrome/browser/guest_view/extension_options/extension_options_guest.cc

+++ b/chrome/browser/guest_view/extension_options/extension_options_guest.cc

@@ -10,6 +10,7 @@

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

#include "chrome/common/extensions/api/extension_options_internal.h"

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

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

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

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

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

@@ -59,12 +60,12 @@ void ExtensionOptionsGuest::CreateWebContents(

std::string extension_id;

create_params.GetString(extensionoptions::kExtensionId, &extension_id);

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

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

callback.Run(NULL);

return;

}

- if (extensions::Extension::IdIsValid(embedder_extension_id) &&

+ if (crx_file::id_util::IdIsValid(embedder_extension_id) &&

extension_id != embedder_extension_id) {

// Extensions cannot embed other extensions' options pages.

callback.Run(NULL);