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

Unified Diff: extensions/common/manifest_handlers/offline_enabled_info.cc

Issue 181233007: kiosk: Fix network check skipped regression. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: offline_enabled default value from webview permission Created 6 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: extensions/common/manifest_handlers/offline_enabled_info.cc
diff --git a/extensions/common/manifest_handlers/offline_enabled_info.cc b/extensions/common/manifest_handlers/offline_enabled_info.cc
index 1d1f8b15402c56ddc9b065b714bd75998624edce..6772d722d60ee4422fb0132766331c8e1484bdc2 100644
--- a/extensions/common/manifest_handlers/offline_enabled_info.cc
+++ b/extensions/common/manifest_handlers/offline_enabled_info.cc
@@ -10,6 +10,8 @@
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "extensions/common/manifest_constants.h"
+#include "extensions/common/permissions/api_permission_set.h"
+#include "extensions/common/permissions/permissions_data.h"
namespace extensions {
@@ -37,11 +39,17 @@ OfflineEnabledHandler::~OfflineEnabledHandler() {
bool OfflineEnabledHandler::Parse(Extension* extension, base::string16* error) {
if (!extension->manifest()->HasKey(keys::kOfflineEnabled)) {
- // Only platform apps default to being enabled offline, and we should only
- // attempt parsing without a key present if it is a platform app.
+ // Only platform apps are provided with a default offline enabled value.
+ // A platform apps is offline enabled unless it requests the webview
not at google - send to devlin 2014/03/06 22:39:15 apps -> app
xiyuan 2014/03/06 23:41:01 Done.
+ // permission. That is, offline_enabled is true when there is NO webview
+ // permission requested and false when webview permission is present.
DCHECK(extension->is_platform_app());
+
+ const bool has_webview_permission =
+ PermissionsData::GetInitialAPIPermissions(extension)
+ ->count(APIPermission::kWebView);
extension->SetManifestData(keys::kOfflineEnabled,
- new OfflineEnabledInfo(true));
+ new OfflineEnabledInfo(!has_webview_permission));
return true;
}

Powered by Google App Engine
This is Rietveld 408576698