Added a new policy setting as well as corrisponding registry key to allow GCF users the option to d…

chrome_frame/policy_settings.cc

Index: chrome_frame/policy_settings.cc
===================================================================
--- chrome_frame/policy_settings.cc	(revision 213668)
+++ chrome_frame/policy_settings.cc	(working copy)
@@ -105,6 +105,40 @@
 }
 
 // static
+void PolicySettings::ReadMetadataCheckSettings(
+    PerformMetadataCheck* metadata_check) {

[robertshield, 2013/07/30 03:12:07]

please use two space-char indents everywhere here.

+        DCHECK(metadata_check);
+
+        *metadata_check = METADATA_CHECK_NOT_SPECIFIED;
+
+        base::win::RegKey config_key;
+        DWORD value = METADATA_CHECK_NOT_SPECIFIED;
+        std::wstring settings_value(
+            ASCIIToWide(policy::key::kChromeFrameMetadataCheckSettings));
+        for (int i = 0; i < arraysize(kRootKeys); ++i) {

[grt (UTC plus 2), 2013/07/30 03:56:15]

please extract this hunk of code into a private function in the unnamed
namespace and make the other two places in this file that do the exact same
thing call it.

+            if ((config_key.Open(kRootKeys[i], policy::kRegistryChromePolicyKey,
+                KEY_READ) == ERROR_SUCCESS) &&
+                (config_key.ReadValueDW(settings_value.c_str(),
+                &value) == ERROR_SUCCESS)) {
+                    break;
+            }
+        }
+
+        DCHECK(value == METADATA_CHECK_NOT_SPECIFIED ||
+            value == METADATA_CHECK_NO ||
+            value == METADATA_CHECK_YES) <<

[robertshield, 2013/07/30 03:12:07]

the "value"s should be aligned.

[grt (UTC plus 2), 2013/07/30 03:56:15]

and "<<" should be moved down to the next line

+            "invalid metadata check setting: " << value;
+
+        if (value != METADATA_CHECK_NO && value != METADATA_CHECK_YES) {
+            DVLOG(1) << "metadata check not specified via policy";
+        } else {
+            *metadata_check = static_cast<PerformMetadataCheck>(value);
+            DVLOG(1) << "Metadata check as specified via policy: "
+                << *metadata_check;
+        }
+}
+
+// static
 void PolicySettings::ReadContentTypeSetting(
     std::vector<std::wstring>* content_type_list) {
   DCHECK(content_type_list);
@@ -156,6 +190,7 @@
 
 void PolicySettings::RefreshFromRegistry() {
   RendererForUrl default_renderer;
+  PerformMetadataCheck metadata_check;
   std::vector<std::wstring> renderer_exclusion_list;
   std::vector<std::wstring> content_type_list;
   std::wstring application_locale;
@@ -165,6 +200,7 @@
 
   // Read the latest settings from the registry
   ReadUrlSettings(&default_renderer, &renderer_exclusion_list);
+  ReadMetadataCheckSettings(&metadata_check);
   ReadContentTypeSetting(&content_type_list);
   ReadStringSetting(policy::key::kApplicationLocaleValue, &application_locale);
   ReadStringSetting(policy::key::kAdditionalLaunchParameters,
@@ -181,6 +217,7 @@
   using std::swap;
 
   swap(default_renderer_, default_renderer);
+  swap(metadata_check_, metadata_check);
   swap(renderer_exclusion_list_, renderer_exclusion_list);
   swap(content_type_list_, content_type_list);
   swap(application_locale_, application_locale);