summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/app_window/app_window_api.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/api/app_window/app_window_api.cc')
-rw-r--r--chrome/browser/extensions/api/app_window/app_window_api.cc16
1 files changed, 10 insertions, 6 deletions
diff --git a/chrome/browser/extensions/api/app_window/app_window_api.cc b/chrome/browser/extensions/api/app_window/app_window_api.cc
index 3f05a81..c6623e0 100644
--- a/chrome/browser/extensions/api/app_window/app_window_api.cc
+++ b/chrome/browser/extensions/api/app_window/app_window_api.cc
@@ -26,6 +26,7 @@
#include "content/public/common/url_constants.h"
#include "extensions/browser/extensions_browser_client.h"
#include "extensions/browser/image_util.h"
+#include "extensions/common/permissions/permissions_data.h"
#include "extensions/common/switches.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/base/ui_base_types.h"
@@ -225,7 +226,8 @@ bool AppWindowCreateFunction::RunAsync() {
return false;
if (options->transparent_background.get() &&
- (GetExtension()->HasAPIPermission(APIPermission::kExperimental) ||
+ (GetExtension()->permissions_data()->HasAPIPermission(
+ APIPermission::kExperimental) ||
CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableExperimentalExtensionApis))) {
create_params.transparent_background = *options->transparent_background;
@@ -240,7 +242,8 @@ bool AppWindowCreateFunction::RunAsync() {
if (options->always_on_top.get()) {
create_params.always_on_top = *options->always_on_top.get();
- if (create_params.always_on_top && !GetExtension()->HasAPIPermission(
+ if (create_params.always_on_top &&
+ !GetExtension()->permissions_data()->HasAPIPermission(
APIPermission::kAlwaysOnTopWindows)) {
error_ = app_window_constants::kAlwaysOnTopPermission;
return false;
@@ -419,10 +422,11 @@ bool AppWindowCreateFunction::GetBoundsSpec(
AppWindow::Frame AppWindowCreateFunction::GetFrameFromString(
const std::string& frame_string) {
- if (frame_string == kHtmlFrameOption &&
- (GetExtension()->HasAPIPermission(APIPermission::kExperimental) ||
- CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableExperimentalExtensionApis))) {
+ if (frame_string == kHtmlFrameOption &&
+ (GetExtension()->permissions_data()->HasAPIPermission(
+ APIPermission::kExperimental) ||
+ CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableExperimentalExtensionApis))) {
inject_html_titlebar_ = true;
return AppWindow::FRAME_NONE;
}