chrome/browser/extensions/extension_util.cc - Issue 342003005: Show alert failure for reloading unpacked extensions with bad manifest

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

Issue 342003005: Show alert failure for reloading unpacked extensions with bad manifest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Moved path handling back to C++ Created 6 years, 6 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

« chrome/browser/background/background_contents_service.cc ('K') | « chrome/browser/extensions/extension_service_unittest.cc ('k') | chrome/browser/extensions/unpacked_installer.h » ('j') | chrome/browser/resources/extensions/extension_loader.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_util.cc

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

index 6b27885445973a01fb41f875222c267a0e1e99c6..92018d0b9f21addbf4f1664d26829f440da523ef 100644

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

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

@@ -113,7 +113,7 @@ void SetIsIncognitoEnabled(const std::string& extension_id,

// by const ref everywhere. Make a copy to be safe.

std::string id = extension_id;

if (extension_is_enabled)

- service->ReloadExtension(id);

+ service->ReloadExtension(id, true);

// Reloading the extension invalidates the |extension| pointer.

extension = service->GetInstalledExtension(id);

@@ -167,7 +167,7 @@ void SetAllowFileAccess(const std::string& extension_id,

bool extension_is_enabled = service->extensions()->Contains(extension_id);

if (extension_is_enabled)

- service->ReloadExtension(extension_id);

+ service->ReloadExtension(extension_id, true);

}

bool AllowedScriptingOnAllUrls(const std::string& extension_id,