Merge 242400 "Remove installation of Chrome Frame."

chrome/installer/util/master_preferences_constants.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 the constants used to process master_preferences files
 // used by setup and first run.
 
 #ifndef CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_CONSTANTS_H_
 #define CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_CONSTANTS_H_
 
 namespace installer {
 namespace master_preferences {
 // All the preferences below are expected to be inside the JSON "distribution"
 // block. Some of them also have equivalent command line option. If same option
 // is specified in master preference as well as command line, the command line
 // value takes precedence.
 
 // Boolean. Use alternate text for the shortcut. Cmd line override present.
 extern const char kAltShortcutText[];
 // Boolean. Whether to instruct the installer to auto-launch chrome on computer
 // startup. The default (if not provided) is |false|.
 extern const char kAutoLaunchChrome[];
 // Boolean. This is to be a Chrome install. (When using MultiInstall)
 extern const char kChrome[];
 // Boolean. This is to be a Chrome App Host install.
 extern const char kChromeAppHostDeprecated[];  // TODO(huangs): Remove by M27.
 // Boolean. This is to be a Chrome App Launcher install.
 extern const char kChromeAppLauncher[];
-// Boolean. This is to be a Chrome Frame install.
-extern const char kChromeFrame[];
 // Integer. Icon index from chrome.exe to use for shortcuts.
 extern const char kChromeShortcutIconIndex[];
 // Boolean. This is a legacy preference and should no longer be used; it is
 // kept around so that old master_preferences which specify
 // "create_all_shortcuts":false still enforce the new
 // "do_not_create_(desktop|quick_launch)_shortcut" preferences. Setting this to
 // true no longer has any impact.
 extern const char kCreateAllShortcuts[];
 // Boolean pref that disables all logging.
 extern const char kDisableLogging[];
@@ skipping 54 matching lines @@
 // Boolean. Install Chrome to system wise location. Cmd line override present.
 extern const char kSystemLevel[];
 // Boolean. Run installer in verbose mode. Cmd line override present.
 extern const char kVerboseLogging[];
 // Name of the block that contains the extensions on the master preferences.
 extern const char kExtensionsBlock[];
 }  // namespace master_preferences
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_CONSTANTS_H_