| Index: chrome/installer/util/master_preferences_constants.h
|
| diff --git a/chrome/installer/util/master_preferences_constants.h b/chrome/installer/util/master_preferences_constants.h
|
| index 9e626f2c9efd1800217afaaf5634c775c531235a..f6adedd1675a8f5ef245f12a97e709d3a2316fc1 100644
|
| --- a/chrome/installer/util/master_preferences_constants.h
|
| +++ b/chrome/installer/util/master_preferences_constants.h
|
| @@ -17,60 +17,60 @@ namespace master_preferences {
|
| // value takes precedence.
|
|
|
| // Boolean. Use alternate text for the shortcut. Cmd line override present.
|
| -extern const wchar_t kAltShortcutText[];
|
| +extern const char kAltShortcutText[];
|
| // Boolean. Use alternate smaller first run info bubble.
|
| -extern const wchar_t kAltFirstRunBubble[];
|
| +extern const char kAltFirstRunBubble[];
|
| // Boolean. This is to be a Chrome Frame install.
|
| -extern const wchar_t kChromeFrame[];
|
| +extern const char kChromeFrame[];
|
| // Integer. Icon index from chrome.exe to use for shortcuts.
|
| -extern const wchar_t kChromeShortcutIconIndex[];
|
| +extern const char kChromeShortcutIconIndex[];
|
| // Boolean. Create Desktop and QuickLaunch shortcuts. Cmd line override present.
|
| -extern const wchar_t kCreateAllShortcuts[];
|
| +extern const char kCreateAllShortcuts[];
|
| // Boolean pref that triggers silent import of the default browser bookmarks.
|
| -extern const wchar_t kDistroImportBookmarksPref[];
|
| +extern const char kDistroImportBookmarksPref[];
|
| // String pref that triggers silent import of bookmarks from the html file at
|
| // given path.
|
| -extern const wchar_t kDistroImportBookmarksFromFilePref[];
|
| +extern const char kDistroImportBookmarksFromFilePref[];
|
| // Boolean pref that triggers silent import of the default browser history.
|
| -extern const wchar_t kDistroImportHistoryPref[];
|
| +extern const char kDistroImportHistoryPref[];
|
| // Boolean pref that triggers silent import of the default browser homepage.
|
| -extern const wchar_t kDistroImportHomePagePref[];
|
| +extern const char kDistroImportHomePagePref[];
|
| // Boolean pref that triggers silent import of the default search engine.
|
| -extern const wchar_t kDistroImportSearchPref[];
|
| +extern const char kDistroImportSearchPref[];
|
| // Integer. RLZ ping delay in seconds.
|
| -extern const wchar_t kDistroPingDelay[];
|
| +extern const char kDistroPingDelay[];
|
| // Boolean pref that triggers loading the welcome page.
|
| -extern const wchar_t kDistroShowWelcomePage[];
|
| +extern const char kDistroShowWelcomePage[];
|
| // Boolean pref that triggers skipping the first run dialogs.
|
| -extern const wchar_t kDistroSkipFirstRunPref[];
|
| +extern const char kDistroSkipFirstRunPref[];
|
| // Boolean. Do not show first run bubble, even if it would otherwise be shown.
|
| -extern const wchar_t kDistroSuppressFirstRunBubble[];
|
| +extern const char kDistroSuppressFirstRunBubble[];
|
| // Boolean. Do not create Chrome desktop shortcuts. Cmd line override present.
|
| -extern const wchar_t kDoNotCreateShortcuts[];
|
| +extern const char kDoNotCreateShortcuts[];
|
| // Boolean. Do not launch Chrome after first install. Cmd line override present.
|
| -extern const wchar_t kDoNotLaunchChrome[];
|
| +extern const char kDoNotLaunchChrome[];
|
| // Boolean. Do not register with Google Update to have Chrome launched after
|
| // install. Cmd line override present.
|
| -extern const wchar_t kDoNotRegisterForUpdateLaunch[];
|
| +extern const char kDoNotRegisterForUpdateLaunch[];
|
| // Boolean. Register Chrome as default browser. Cmd line override present.
|
| -extern const wchar_t kMakeChromeDefault[];
|
| +extern const char kMakeChromeDefault[];
|
| // Boolean. Register Chrome as default browser for the current user.
|
| -extern const wchar_t kMakeChromeDefaultForUser[];
|
| +extern const char kMakeChromeDefaultForUser[];
|
| // Boolean. Expect to be run by an MSI installer. Cmd line override present.
|
| -extern const wchar_t kMsi[];
|
| +extern const char kMsi[];
|
| // Boolean. Show EULA dialog before install.
|
| -extern const wchar_t kRequireEula[];
|
| +extern const char kRequireEula[];
|
| // Boolean. Use experimental search engine selection dialog.
|
| -extern const wchar_t kSearchEngineExperimentPref[];
|
| +extern const char kSearchEngineExperimentPref[];
|
| // Boolean. Randomize logos in experimental search engine selection dialog.
|
| -extern const wchar_t kSearchEngineExperimentRandomizePref[];
|
| +extern const char kSearchEngineExperimentRandomizePref[];
|
| // Boolean. Install Chrome to system wise location. Cmd line override present.
|
| -extern const wchar_t kSystemLevel[];
|
| +extern const char kSystemLevel[];
|
| // Boolean. Run installer in verbose mode. Cmd line override present.
|
| -extern const wchar_t kVerboseLogging[];
|
| +extern const char kVerboseLogging[];
|
| // Name of the block that contains the extensions on the master preferences.
|
| -extern const wchar_t kExtensionsBlock[];
|
| -}
|
| -}
|
| +extern const char kExtensionsBlock[];
|
| +} // namespace master_preferences
|
| +} // namespace installer_util
|
|
|
| #endif // CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_CONSTANTS_H_
|
|
|