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

Unified Diff: chrome/browser/extensions/api/developer_private/developer_private_api.cc

Issue 580363002: Update app info and install prompt UI to show retained devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased to ToT. Created 6 years, 3 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/app/generated_resources.grd ('k') | chrome/browser/extensions/extension_install_prompt.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/developer_private/developer_private_api.cc
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
index e3417879bfa331a18ff86e66a2ac10b5e3908b8a..ad949819ea0f22886c950c498be49d2c9b353e09 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
@@ -46,6 +46,7 @@
#include "content/public/browser/site_instance.h"
#include "content/public/browser/storage_partition.h"
#include "content/public/browser/web_contents.h"
+#include "extensions/browser/api/device_permissions_manager.h"
#include "extensions/browser/app_window/app_window.h"
#include "extensions/browser/app_window/app_window_registry.h"
#include "extensions/browser/extension_error.h"
@@ -758,7 +759,14 @@ bool DeveloperPrivateShowPermissionsDialogFunction::RunSync() {
retained_file_paths.push_back(retained_file_entries[i].path);
}
}
- prompt_->ReviewPermissions(this, extension, retained_file_paths);
+ std::vector<base::string16> retained_device_messages;
+ if (extension->permissions_data()->HasAPIPermission(APIPermission::kUsb)) {
+ retained_device_messages =
+ extensions::DevicePermissionsManager::Get(GetProfile())
+ ->GetPermissionMessageStrings(extension_id_);
+ }
+ prompt_->ReviewPermissions(
+ this, extension, retained_file_paths, retained_device_messages);
return true;
}
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/extension_install_prompt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698