Upstream version 9.38.198.0

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

diff --git a/src/chrome/browser/content_settings/content_settings_utils.h b/src/chrome/browser/content_settings/content_settings_utils.h
index 0d597d7..7a7a1de 100644 (file)
--- a/src/chrome/browser/content_settings/content_settings_utils.h
+++ b/src/chrome/browser/content_settings/content_settings_utils.h
@@ -10,7 +10,7 @@
 
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_pattern.h"
-#include "chrome/common/content_settings_types.h"
+#include "components/content_settings/core/common/content_settings_types.h"
 
 namespace base {
 class Value;
@@ -28,6 +28,9 @@ typedef std::pair<ContentSettingsPattern, ContentSettingsPattern> PatternPair;
 
 std::string GetTypeName(ContentSettingsType type);
 
+bool GetTypeFromName(const std::string& name,
+                     ContentSettingsType* return_setting);
+
 // Converts |Value| to |ContentSetting|.
 ContentSetting ValueToContentSetting(const base::Value* value);