diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 23:07:40 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 23:07:40 +0000 |
| commit | 5ac670a3a8c4e3e2f2b7ed3ad1190f9ed34dd512 (patch) | |
| tree | cff9275bd93bc02c09e2d9836a82b086745a9852 /chrome/common | |
| parent | 10da830b7fe028f85cf2167fadb64852cfe526ee (diff) | |
| download | chromium_src-5ac670a3a8c4e3e2f2b7ed3ad1190f9ed34dd512.zip chromium_src-5ac670a3a8c4e3e2f2b7ed3ad1190f9ed34dd512.tar.gz chromium_src-5ac670a3a8c4e3e2f2b7ed3ad1190f9ed34dd512.tar.bz2 | |
Policy support for being able to specify a list of content types that Chrome Frame should handle.
TEST=This adds a new policy list for Chrome Frame, "ChromeFrameContentTypes", which can be used to specify a list of content types that should always be rendered in Chrome Frame.
BUG=56543
Review URL: http://codereview.chromium.org/3611002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61432 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/policy_constants.cc | 1 | ||||
| -rw-r--r-- | chrome/common/policy_constants.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/chrome/common/policy_constants.cc b/chrome/common/policy_constants.cc index d34e0db..4ecf17e 100644 --- a/chrome/common/policy_constants.cc +++ b/chrome/common/policy_constants.cc @@ -57,6 +57,7 @@ const char kSavingBrowserHistoryDisabled[] = "SavingBrowserHistoryDisabled"; const char kChromeFrameRendererSettings[] = "ChromeFrameRendererSettings"; const char kRenderInChromeFrameList[] = "RenderInChromeFrameList"; const char kRenderInHostList[] = "RenderInHostList"; +const char kChromeFrameContentTypes[] = "ChromeFrameContentTypes"; } // namespace key diff --git a/chrome/common/policy_constants.h b/chrome/common/policy_constants.h index d07b799..1cb00a1 100644 --- a/chrome/common/policy_constants.h +++ b/chrome/common/policy_constants.h @@ -54,7 +54,7 @@ extern const char kSavingBrowserHistoryDisabled[]; extern const char kChromeFrameRendererSettings[]; extern const char kRenderInChromeFrameList[]; extern const char kRenderInHostList[]; - +extern const char kChromeFrameContentTypes[]; } // namespace key } // namespace policy |