diff options
| author | joe.knoll@workday.com <joe.knoll@workday.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-21 03:47:07 +0000 |
|---|---|---|
| committer | joe.knoll@workday.com <joe.knoll@workday.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-21 03:47:07 +0000 |
| commit | 99193429304051f9005bf9ce953a961d28e37635 (patch) | |
| tree | e5fabf7a8cef1db995f9f78854f0ca5cbe40c1a0 /chrome_frame/policy_settings.h | |
| parent | 1591f0492b852efdfc135519ba866b1dca773aa3 (diff) | |
| download | chromium_src-99193429304051f9005bf9ce953a961d28e37635.zip chromium_src-99193429304051f9005bf9ce953a961d28e37635.tar.gz chromium_src-99193429304051f9005bf9ce953a961d28e37635.tar.bz2 | |
Added a new policy setting as well as corrisponding registry key to allow GCF users the option to disable the meta tag check. That is, the tag that websites can use to enable GCF. This way the white/black lists are fully respected by GCF.
BUG=225971
TEST=Set HKEY_CURRENT_USER\Software\Google\ChromeFrame\SkipGCFMetaDataCheck to true to disable GCF on sites enabled through the meta data tag (fully respects white/black lists).
Contributed by joe.knoll@workday.com
TBR=joaodasilva@chromium.org,robertshield@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23295005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/policy_settings.h')
| -rw-r--r-- | chrome_frame/policy_settings.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/chrome_frame/policy_settings.h b/chrome_frame/policy_settings.h index 104f713..7b282d4 100644 --- a/chrome_frame/policy_settings.h +++ b/chrome_frame/policy_settings.h @@ -17,18 +17,28 @@ // TODO(tommi): Use Chrome's classes for this (and the notification service). class PolicySettings { public: - typedef enum RendererForUrl { + enum RendererForUrl { RENDERER_NOT_SPECIFIED = -1, RENDER_IN_HOST, RENDER_IN_CHROME_FRAME, }; + enum SkipMetadataCheck { + SKIP_METADATA_CHECK_NOT_SPECIFIED = -1, + SKIP_METADATA_CHECK_NO, + SKIP_METADATA_CHECK_YES, + }; + static PolicySettings* GetInstance(); RendererForUrl default_renderer() const { return default_renderer_; } + SkipMetadataCheck skip_metadata_check() const { + return skip_metadata_check_; + } + RendererForUrl GetRendererForUrl(const wchar_t* url); RendererForUrl GetRendererForContentType(const wchar_t* content_type); @@ -52,6 +62,7 @@ class PolicySettings { // Helper functions for reading settings from the registry static void ReadUrlSettings(RendererForUrl* default_renderer, std::vector<std::wstring>* renderer_exclusion_list); + static void ReadMetadataCheckSettings(SkipMetadataCheck* skip_metadata_check); static void ReadContentTypeSetting( std::vector<std::wstring>* content_type_list); static void ReadStringSetting(const char* value_name, std::wstring* value); @@ -60,6 +71,7 @@ class PolicySettings { protected: PolicySettings() : default_renderer_(RENDERER_NOT_SPECIFIED), + skip_metadata_check_(SKIP_METADATA_CHECK_NOT_SPECIFIED), additional_launch_parameters_(CommandLine::NO_PROGRAM), suppress_turndown_prompt_(false) { RefreshFromRegistry(); @@ -73,6 +85,7 @@ class PolicySettings { protected: RendererForUrl default_renderer_; + SkipMetadataCheck skip_metadata_check_; std::vector<std::wstring> renderer_exclusion_list_; std::vector<std::wstring> content_type_list_; std::wstring application_locale_; |