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

chrome_frame/policy_settings.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome_frame/policy_settings.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
@@ skipping 87 matching lines @@
     EnumerateKeyValues(config_key.Handle(),
         ASCIIToWide(exclusion_list_name).c_str(), renderer_exclusion_list);
 
     DVLOG(1) << "Default renderer as specified via policy: "
              << *default_renderer
              << " exclusion list size: " << renderer_exclusion_list->size();
   }
 }
 
 // static
+void PolicySettings::ReadMetadataCheckSettings(
+    PerformMetadataCheck* metadata_check) {
+  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) {
+    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) <<

[grt (UTC plus 2), 2013/08/01 19:22:57]

move << to 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);
 
   std::wstring sub_key(policy::kRegistryChromePolicyKey);
   sub_key += L"\\";
   sub_key += ASCIIToWide(policy::key::kChromeFrameContentTypes);
 
   content_type_list->clear();
   for (int i = 0; i < arraysize(kRootKeys) && content_type_list->empty();
@@ skipping 31 matching lines @@
         (config_key.ReadValueDW(value_name_str.c_str(),
                                 &dword_value) == ERROR_SUCCESS)) {
       *value = (dword_value != 0);
       break;
     }
   }
 }
 
 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;
   CommandLine additional_launch_parameters(CommandLine::NO_PROGRAM);
   std::wstring additional_parameters_str;
   bool suppress_turndown_prompt = false;
 
   // 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,
                     &additional_parameters_str);
   if (!additional_parameters_str.empty()) {
     additional_parameters_str.insert(0, L"fake.exe ");
     additional_launch_parameters.ParseFromString(additional_parameters_str);
   }
   ReadBoolSetting(policy::key::kSuppressChromeFrameTurndownPrompt,
                   &suppress_turndown_prompt);
 
   // Nofail swap in the new values.  (Note: this is all that need be protected
   // under a mutex if/when this becomes thread safe.)
   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);
   swap(additional_launch_parameters_, additional_launch_parameters);
   swap(suppress_turndown_prompt_, suppress_turndown_prompt);
 }
 
 // static
 PolicySettings* PolicySettings::GetInstance() {
   return Singleton<PolicySettings>::get();
 }