Merge 242400 "Remove installation of Chrome Frame."

chrome/installer/util/master_preferences.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.
 //
 // This file contains functions processing master preference file used by
 // setup and first run.
 
 #ifndef CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
 #define CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
 
@@ skipping 154 matching lines @@
   }
 
   bool install_chrome() const {
     return chrome_;
   }
 
   bool install_chrome_app_launcher() const {
     return chrome_app_launcher_;
   }
 
-  bool install_chrome_frame() const {
-    return chrome_frame_;
-  }
-
   bool is_multi_install() const {
     return multi_install_;
   }
 
   // Returns a reference to this MasterPreferences' root dictionary of values.
   const base::DictionaryValue& master_dictionary() const {
     return *master_dictionary_.get();
   }
 
   // Returns a static preference object that has been initialized with the
@@ skipping 14 matching lines @@
   // Enforces legacy preferences that should no longer be used, but could be
   // found in older master_preferences files.
   void EnforceLegacyPreferences();
 
  protected:
   scoped_ptr<base::DictionaryValue> master_dictionary_;
   base::DictionaryValue* distribution_;
   bool preferences_read_from_file_;
   bool chrome_;
   bool chrome_app_launcher_;
-  bool chrome_frame_;
   bool multi_install_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MasterPreferences);
 };
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_