summaryrefslogtreecommitdiff
path: root/chromium/content/browser/webui/web_ui_data_source_impl.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-08 10:28:10 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-20 13:40:30 +0000
commite733310db58160074f574c429d48f8308c0afe17 (patch)
treef8aef4b7e62a69928dbcf880620eece20f98c6df /chromium/content/browser/webui/web_ui_data_source_impl.h
parent2f583e4aec1ae3a86fa047829c96b310dc12ecdf (diff)
downloadqtwebengine-chromium-e733310db58160074f574c429d48f8308c0afe17.tar.gz
BASELINE: Update Chromium to 56.0.2924.122
Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/content/browser/webui/web_ui_data_source_impl.h')
-rw-r--r--chromium/content/browser/webui/web_ui_data_source_impl.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/chromium/content/browser/webui/web_ui_data_source_impl.h b/chromium/content/browser/webui/web_ui_data_source_impl.h
index b121d2375c5..387209ebc3d 100644
--- a/chromium/content/browser/webui/web_ui_data_source_impl.h
+++ b/chromium/content/browser/webui/web_ui_data_source_impl.h
@@ -5,8 +5,11 @@
#ifndef CONTENT_BROWSER_WEBUI_WEB_UI_DATA_SOURCE_IMPL_H_
#define CONTENT_BROWSER_WEBUI_WEB_UI_DATA_SOURCE_IMPL_H_
+#include <stdint.h>
+
#include <map>
#include <string>
+#include <unordered_set>
#include "base/callback.h"
#include "base/compiler_specific.h"
@@ -34,6 +37,7 @@ class CONTENT_EXPORT WebUIDataSourceImpl
void AddLocalizedStrings(
const base::DictionaryValue& localized_strings) override;
void AddBoolean(const std::string& name, bool value) override;
+ void AddInteger(const std::string& name, int32_t value) override;
void SetJsonPath(const std::string& path) override;
void AddResourcePath(const std::string& path, int resource_id) override;
void SetDefaultResource(int resource_id) override;
@@ -46,6 +50,9 @@ class CONTENT_EXPORT WebUIDataSourceImpl
void DisableDenyXFrameOptions() override;
void DisableI18nAndUseGzipForAllPaths() override;
+ // When DisableI18nAndUseGzipForAllPaths is enabled, exclude the given |path|.
+ void ExcludePathFromGzip(const std::string& path);
+
protected:
~WebUIDataSourceImpl() override;
@@ -82,6 +89,7 @@ class CONTENT_EXPORT WebUIDataSourceImpl
int default_resource_;
std::string json_path_;
std::map<std::string, int> path_to_idr_map_;
+ std::unordered_set<std::string> excluded_paths_;
// The |replacements_| is intended to replace |localized_strings_|.
// TODO(dschuyler): phase out |localized_strings_| in Q1 2016. (Or rename
// to |load_time_flags_| if the usage is reduced to storing flags only).