Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1236)

Unified Diff: chrome/browser/extensions/extension_install_prompt.cc

Issue 314113010: Remove deprecated permissions functions from Extension (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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 f0947c2490eadba6e1761c4bd962457aaa5a4d29..f0ba3c7ec2c14d8cb1600c9f6447411b1caa55ee 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -530,7 +530,7 @@ void ExtensionInstallPrompt::ConfirmStandaloneInstall(
const ExtensionInstallPrompt::Prompt& prompt) {
DCHECK(ui_loop_ == base::MessageLoop::current());
extension_ = extension;
- permissions_ = extension->GetActivePermissions();
+ permissions_ = extension->permissions_data()->active_permissions();
delegate_ = delegate;
prompt_ = prompt;
@@ -556,7 +556,7 @@ void ExtensionInstallPrompt::ConfirmInstall(
const ShowDialogCallback& show_dialog_callback) {
DCHECK(ui_loop_ == base::MessageLoop::current());
extension_ = extension;
- permissions_ = extension->GetActivePermissions();
+ permissions_ = extension->permissions_data()->active_permissions();
delegate_ = delegate;
prompt_.set_type(INSTALL_PROMPT);
show_dialog_callback_ = show_dialog_callback;
@@ -583,7 +583,7 @@ void ExtensionInstallPrompt::ConfirmReEnable(Delegate* delegate,
const Extension* extension) {
DCHECK(ui_loop_ == base::MessageLoop::current());
extension_ = extension;
- permissions_ = extension->GetActivePermissions();
+ permissions_ = extension->permissions_data()->active_permissions();
delegate_ = delegate;
bool is_remote_install =
install_ui_->profile() &&
@@ -607,7 +607,7 @@ void ExtensionInstallPrompt::ConfirmExternalInstall(
const Prompt& prompt) {
DCHECK(ui_loop_ == base::MessageLoop::current());
extension_ = extension;
- permissions_ = extension->GetActivePermissions();
+ permissions_ = extension->permissions_data()->active_permissions();
delegate_ = delegate;
prompt_ = prompt;
show_dialog_callback_ = show_dialog_callback;
@@ -634,7 +634,7 @@ void ExtensionInstallPrompt::ReviewPermissions(
const std::vector<base::FilePath>& retained_file_paths) {
DCHECK(ui_loop_ == base::MessageLoop::current());
extension_ = extension;
- permissions_ = extension->GetActivePermissions();
+ permissions_ = extension->permissions_data()->active_permissions();
prompt_.set_retained_files(retained_file_paths);
delegate_ = delegate;
prompt_.set_type(POST_INSTALL_PERMISSIONS_PROMPT);
« no previous file with comments | « chrome/browser/extensions/extension_gcm_app_handler_unittest.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698