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

Unified Diff: chrome/browser/extensions/api/guest_view/guest_view_internal_api.cc

Issue 353013007: Implement <appview> skeleton. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@app_view_skeleton
Patch Set: Fixed PermissionsTest unit test 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/api/guest_view/guest_view_internal_api.cc
diff --git a/chrome/browser/extensions/api/guest_view/guest_view_internal_api.cc b/chrome/browser/extensions/api/guest_view/guest_view_internal_api.cc
index fe098e25d26ed11cc2c78f29185e8a0ed834e283..ddf108d5f0ee0b10946361206f0f7054fe079e59 100644
--- a/chrome/browser/extensions/api/guest_view/guest_view_internal_api.cc
+++ b/chrome/browser/extensions/api/guest_view/guest_view_internal_api.cc
@@ -13,8 +13,9 @@
#include "extensions/common/permissions/permissions_data.h"
namespace {
-const char* kWebViewPermissionRequiredError =
- "\"webview\" permission is required for allocating instance ID.";
+const char* kPermissionRequiredError =
+ "\"webview\" or \"appview\" permission is required for allocating "
+ "instance ID.";
} // namespace
namespace extensions {
@@ -30,10 +31,11 @@ bool GuestViewInternalCreateGuestFunction::RunAsync() {
base::DictionaryValue* create_params;
EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &create_params));
- if (!GetExtension()->permissions_data()->HasAPIPermission(
- APIPermission::kWebView)) {
- LOG(ERROR) << kWebViewPermissionRequiredError;
- error_ = kWebViewPermissionRequiredError;
+ const PermissionsData* permissions_data = GetExtension()->permissions_data();
+ if (!permissions_data->HasAPIPermission(APIPermission::kWebView) &&
+ !permissions_data->HasAPIPermission(APIPermission::kAppView)) {
+ LOG(ERROR) << kPermissionRequiredError;
+ error_ = kPermissionRequiredError;
SendResponse(false);
}
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/guest_view/app_view/app_view_guest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698