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

chrome_frame/policy_settings.h

 // 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.
 
 #ifndef CHROME_FRAME_POLICY_SETTINGS_H_
 #define CHROME_FRAME_POLICY_SETTINGS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 11 matching lines @@
     RENDER_IN_HOST,
     RENDER_IN_CHROME_FRAME,
   };
 
   static PolicySettings* GetInstance();
 
   RendererForUrl default_renderer() const {
     return default_renderer_;
   }
 
+  typedef enum PerformMetadataCheck {

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

remove typedef here and above because they are meaningless. in c++, you can
refer to enum Foo {}; as Foo within the scope that Foo is defined. the c way of
doing things is typedef enum Foo {} Foo; so that you can refer to "enum Foo" as
just "Foo". whoever put the typedef up above in place was mistaken: there's no
need for it, and it's not correct. please don't propagate the bad style here.
thanks.

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

Unless I'm mistaken, the polarity of this is backwards: METADATA_CHECK_YES is
interpreted in utils.cc as skipping rather than performing the check. Please
rename this to SkipMetadataCheck as I previously proposed.

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

as mentioned before, this enum must be moved up so that it immediately follows
enum RendererForUrl above.

+      METADATA_CHECK_NOT_SPECIFIED = -1,

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

two-space indent here rather than four.

+      METADATA_CHECK_NO,
+      METADATA_CHECK_YES,
+  };
+
+  PerformMetadataCheck metadata_check() const {
+    return metadata_check_;
+  }
+
   RendererForUrl GetRendererForUrl(const wchar_t* url);
 
   RendererForUrl GetRendererForContentType(const wchar_t* content_type);
 
   // Returns the policy-configured Chrome app locale, or an empty string if none
   // is configured.
   const std::wstring& ApplicationLocale() const {
     return application_locale_;
   }
 
   // Contains additional parameters that can optionally be configured for the
   // current user via the policy settings.  The program part of this command
   // line object must not be used when appending to another command line.
   const CommandLine& AdditionalLaunchParameters() const;
 
   // Returns true if the Chrome Frame turndown prompt should be suppressed.
   bool suppress_turndown_prompt() const {
     return suppress_turndown_prompt_;
   }
 
   // Helper functions for reading settings from the registry
   static void ReadUrlSettings(RendererForUrl* default_renderer,
       std::vector<std::wstring>* renderer_exclusion_list);
+  static void ReadMetadataCheckSettings(PerformMetadataCheck* metadata_check);
   static void ReadContentTypeSetting(
       std::vector<std::wstring>* content_type_list);
   static void ReadStringSetting(const char* value_name, std::wstring* value);
   static void ReadBoolSetting(const char* value_name, bool* value);
 
  protected:
   PolicySettings()
       : default_renderer_(RENDERER_NOT_SPECIFIED),
+        metadata_check_(METADATA_CHECK_NOT_SPECIFIED),
         additional_launch_parameters_(CommandLine::NO_PROGRAM),
         suppress_turndown_prompt_(false) {
     RefreshFromRegistry();
   }
 
   ~PolicySettings() {
   }
 
   // Protected for now since the class is not thread safe.
   void RefreshFromRegistry();
 
  protected:
   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_;
   bool suppress_turndown_prompt_;
 
  private:
   // This ensures no construction is possible outside of the class itself.
   friend struct DefaultSingletonTraits<PolicySettings>;
   DISALLOW_COPY_AND_ASSIGN(PolicySettings);
 };
 
 #endif  // CHROME_FRAME_POLICY_SETTINGS_H_