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

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

Issue 1301323005: Implement kiosk multiple apps feature. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 4 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/kiosk_secondary_apps_info.cc
diff --git a/extensions/common/manifest_handlers/kiosk_secondary_apps_info.cc b/extensions/common/manifest_handlers/kiosk_secondary_apps_info.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0d2a766fb0a81b9a2f24e86c447a549543a2cc9d
--- /dev/null
+++ b/extensions/common/manifest_handlers/kiosk_secondary_apps_info.cc
@@ -0,0 +1,93 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "extensions/common/manifest_handlers/kiosk_secondary_apps_info.h"
+
+#include "base/memory/scoped_ptr.h"
+#include "base/strings/string16.h"
+#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
+#include "base/values.h"
+#include "extensions/common/manifest_constants.h"
+
+namespace extensions {
+
+namespace keys = manifest_keys;
+
+namespace {
+
+const char kKioskSecondaryAppInfo[] = "kiosk_secondary_app_info";
+const char kAppId[] = "id";
+}
xiyuan 2015/08/26 18:16:17 nit: insert an empty line before. And append "// n
jennyz 2015/08/28 18:24:08 Done.
+
+KioskSecondaryAppsInfo::KioskSecondaryAppsInfo(
+ const std::vector<std::string>& app_ids)
+ : ids(app_ids) {}
+
+KioskSecondaryAppsInfo::~KioskSecondaryAppsInfo() {}
+
+// static
+bool KioskSecondaryAppsInfo::HaveSecondaryApps(const Extension* extension) {
+ return KioskSecondaryAppsInfo::Get(extension) != nullptr;
+}
+
+// static
+KioskSecondaryAppsInfo* KioskSecondaryAppsInfo::Get(
+ const Extension* extension) {
+ return static_cast<KioskSecondaryAppsInfo*>(
+ extension->GetManifestData(kKioskSecondaryAppInfo));
+}
+
+KioskSecondaryAppsHandler::KioskSecondaryAppsHandler() {}
+
+KioskSecondaryAppsHandler::~KioskSecondaryAppsHandler() {}
+
+bool KioskSecondaryAppsHandler::Parse(Extension* extension,
+ base::string16* error) {
not at google - send to devlin 2015/08/26 17:53:59 It's easier to use a manifest type than hand-writi
jennyz 2015/08/28 18:24:08 Yes, I applied the patch you suggested to tools/js
+ // Kiosk secondary apps key is optional.
+ if (!extension->manifest()->HasKey(keys::kKioskSecondaryApps)) {
+ return true;
+ }
+
+ const base::Value* secondary_app_ids = nullptr;
+ if (!extension->manifest()->Get(keys::kKioskSecondaryApps,
+ &secondary_app_ids)) {
+ *error = base::ASCIIToUTF16(manifest_errors::kInvalidKioskSecondaryApps);
+ return false;
+ }
+
+ const base::ListValue* list = nullptr;
+ if (!secondary_app_ids->GetAsList(&list)) {
+ *error = base::ASCIIToUTF16(manifest_errors::kInvalidKioskSecondaryApps);
+ return false;
+ }
+
+ std::vector<std::string> app_ids;
+ for (size_t i = 0; i < list->GetSize(); ++i) {
+ const base::DictionaryValue* app_id_entry = nullptr;
+ if (!list->GetDictionary(i, &app_id_entry)) {
+ *error = base::ASCIIToUTF16(
+ manifest_errors::kInvalidKioskSecondaryAppsBadAppEntry);
+ return false;
+ }
+ std::string app_id;
+ if (!app_id_entry->GetStringWithoutPathExpansion(kAppId, &app_id)) {
+ *error = base::ASCIIToUTF16(
+ manifest_errors::kInvalidKioskSecondaryAppsBadAppId);
+ return false;
+ }
+ app_ids.push_back(app_id);
+ }
+ if (!app_ids.empty()) {
+ extension->SetManifestData(kKioskSecondaryAppInfo,
+ new KioskSecondaryAppsInfo(app_ids));
+ }
+ return true;
+}
+
+const std::vector<std::string> KioskSecondaryAppsHandler::Keys() const {
+ return SingleKey(keys::kKioskSecondaryApps);
+}
+
+} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698