chrome/browser/extensions/extension_install_prompt.cc - Issue 27446002: Move permission warning message handling from PermissionSet to PermissionMessageProvider.

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 27446002: Move permission warning message handling from PermissionSet to PermissionMessageProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: more better Created 7 years, 2 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/extension_disabled_ui.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | chrome/common/extensions/permissions/base_permission_message_provider.h » ('J')
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 1eb7171b559d1e821c89b8aa582b8378a759a76d..1209dfdd7ec3def28b6fe073356c430b594daae1 100644

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

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

@@ -36,6 +36,7 @@

#include "extensions/common/extension_resource.h"

#include "extensions/common/manifest.h"

#include "extensions/common/manifest_constants.h"

+#include "extensions/common/permissions/permission_message_provider.h"

#include "extensions/common/url_pattern.h"

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

@@ -805,9 +806,11 @@ void ExtensionInstallPrompt::ShowConfirmation() {

Manifest::Type extension_type = extension_ ?

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

prompt_.SetPermissions(

- permissions_->GetWarningMessages(extension_type));

+ extensions::PermissionMessageProvider::Get()->

+ GetWarningMessages(permissions_, extension_type));

prompt_.SetPermissionsDetails(

- permissions_->GetWarningMessagesDetails(extension_type));

+ extensions::PermissionMessageProvider::Get()->

+ GetWarningMessagesDetails(permissions_, extension_type));

}

switch (prompt_.type()) {