Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / content_settings / content_settings_utils.cc

diff --git a/src/chrome/browser/content_settings/content_settings_utils.cc b/src/chrome/browser/content_settings/content_settings_utils.cc
index d8c682c..5c27fdb 100644 (file)
--- a/src/chrome/browser/content_settings/content_settings_utils.cc
+++ b/src/chrome/browser/content_settings/content_settings_utils.cc
@@ -41,6 +41,8 @@ const char* kTypeNames[] = {
   "ppapi-broker",
   "multiple-automatic-downloads",
   "midi-sysex",
+  "push-messaging",
+  "ssl-cert-decisions",
 #if defined(OS_WIN)
   "metro-switch-to-desktop",
 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS)
@@ -63,6 +65,17 @@ std::string GetTypeName(ContentSettingsType type) {
   return std::string(kTypeNames[type]);
 }
 
+bool GetTypeFromName(const std::string& name,
+                     ContentSettingsType* return_setting) {
+  for (size_t type = 0; type < CONTENT_SETTINGS_NUM_TYPES; ++type) {
+    if (name.compare(kTypeNames[type]) == 0) {
+      *return_setting = static_cast<ContentSettingsType>(type);
+      return true;
+    }
+  }
+  return false;
+}
+
 std::string CreatePatternString(
     const ContentSettingsPattern& item_pattern,
     const ContentSettingsPattern& top_level_frame_pattern) {