chrome/browser/extensions/extension_install_prompt.cc - Issue 14651017: Move RuntimeData and related permissions 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/browser/extensions/extension_install_prompt.cc

Issue 14651017: Move RuntimeData and related permissions out of Extension class (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_permissions

Patch Set: Latest master Created 7 years, 7 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/api/web_request/web_request_permissions.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_install_prompt.cc

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

index 408de210bbcc672a05150b4f1b12bbc418aecc99..73b893ce18f4092834b0777f052761f27c4c666c 100644

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

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

@@ -31,6 +31,7 @@

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

#include "chrome/common/extensions/manifest_handlers/icons_handler.h"

#include "chrome/common/extensions/permissions/permission_set.h"

+#include "chrome/common/extensions/permissions/permissions_data.h"

#include "chrome/common/pref_names.h"

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

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

@@ -678,7 +679,9 @@ void ExtensionInstallPrompt::OnMintTokenFailure(

void ExtensionInstallPrompt::ShowConfirmation() {

if (permissions_ &&

- (!extension_ || !extension_->ShouldSkipPermissionWarnings())) {

+ (!extension_ ||

+ !extensions::PermissionsData::ShouldSkipPermissionWarnings(

+ extension_))) {

Manifest::Type extension_type = extension_ ?

extension_->GetType() : Manifest::TYPE_UNKNOWN;

prompt_.SetPermissions(permissions_->GetWarningMessages(extension_type));