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

Unified Diff: chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h

Issue 1004123003: Extensions: Switch to new permission message system, part III (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permissions_tests
Patch Set: Mac Created 5 years, 9 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/ui/views/apps/app_info_dialog/app_info_permissions_panel.h
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h
index f45ba7249601a37c212124bbab31828a6e8b63f8..50293af7b28c80cc59f406a17691987b580fd309 100644
--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h
+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h
@@ -8,7 +8,7 @@
#include <vector>
#include "chrome/browser/ui/views/apps/app_info_dialog/app_info_panel.h"
-#include "ui/gfx/text_constants.h"
+#include "extensions/common/permissions/permission_message_provider.h"
class Profile;
@@ -25,9 +25,6 @@ class GridLayout;
class View;
}
-typedef std::pair<base::string16, std::vector<base::string16>>
- PermissionStringAndDetailsPair;
-
// The summary panel of the app info dialog, which provides basic information
// and controls related to the app.
class AppInfoPermissionsPanel : public AppInfoPanel {
@@ -56,8 +53,7 @@ class AppInfoPermissionsPanel : public AppInfoPanel {
// Returns a list of active permission messages. The first entry is the title
// of the permission; the second is any sub-messages (such as host
// permissions) to be listed underneath that permission.
- const std::vector<PermissionStringAndDetailsPair>
- GetActivePermissionMessages() const;
+ extensions::PermissionMessageStrings GetActivePermissionMessages() const;
int GetRetainedFileCount() const;
base::string16 GetRetainedFileHeading() const;

Powered by Google App Engine
This is Rietveld 408576698