diff options
author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 20:12:50 +0000 |
---|---|---|
committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 20:12:50 +0000 |
commit | c604a55498cea3b78c4eafda2cb408fd16edf6af (patch) | |
tree | b99109b879257d12a2cbe5c537d0281625946bb2 /chrome/installer/util/master_preferences_constants.cc | |
parent | 41c78fa1896c5f849c2160ae5de84c232e2c3de9 (diff) | |
download | chromium_src-c604a55498cea3b78c4eafda2cb408fd16edf6af.zip chromium_src-c604a55498cea3b78c4eafda2cb408fd16edf6af.tar.gz chromium_src-c604a55498cea3b78c4eafda2cb408fd16edf6af.tar.bz2 |
Allowing MSI mode detection to work from the master preferences file.
Refactor the piece of master preferences code that was in setup_util.h|cc (setup) into master_preferences.h|cc (install_util). This adds an install_util -> googleurl dependency, which should to be fine.
Add in master_preferences_dummy.cc to keep the nacl64 stuff compiling happily.
Add values.h|cc to the portion of base built in 64 bit mode and add a minor fix to values.cc to make it build.
Also refactor accompanying master_preferences test code from setup tests to install_util tests.
BUG=19370
Review URL: http://codereview.chromium.org/979003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/master_preferences_constants.cc')
-rw-r--r-- | chrome/installer/util/master_preferences_constants.cc | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/chrome/installer/util/master_preferences_constants.cc b/chrome/installer/util/master_preferences_constants.cc new file mode 100644 index 0000000..6519e4c --- /dev/null +++ b/chrome/installer/util/master_preferences_constants.cc @@ -0,0 +1,32 @@ +// Copyright (c) 2010 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/installer/util/master_preferences_constants.h" + +namespace installer_util { +namespace master_preferences { + const wchar_t kAltFirstRunBubble[] = L"oem_bubble"; + const wchar_t kAltShortcutText[] = L"alternate_shortcut_text"; + const wchar_t kChromeShortcutIconIndex[] = L"chrome_shortcut_icon_index"; + const wchar_t kCreateAllShortcuts[] = L"create_all_shortcuts"; + const wchar_t kDistroImportBookmarksPref[] = L"import_bookmarks"; + const wchar_t kDistroImportHistoryPref[] = L"import_history"; + const wchar_t kDistroImportHomePagePref[] = L"import_home_page"; + const wchar_t kDistroImportSearchPref[] = L"import_search_engine"; + const wchar_t kDistroPingDelay[] = L"ping_delay"; + const wchar_t kDistroShowWelcomePage[] = L"show_welcome_page"; + const wchar_t kDistroSkipFirstRunPref[] = L"skip_first_run_ui"; + const wchar_t kDoNotCreateShortcuts[] = L"do_not_create_shortcuts"; + const wchar_t kDoNotLaunchChrome[] = L"do_not_launch_chrome"; + const wchar_t kDoNotRegisterForUpdateLaunch[] = + L"do_not_register_for_update_launch"; + const wchar_t kMakeChromeDefault[] = L"make_chrome_default"; + const wchar_t kMakeChromeDefaultForUser[] = L"make_chrome_default_for_user"; + const wchar_t kMsi[] = L"msi"; + const wchar_t kRequireEula[] = L"require_eula"; + const wchar_t kSystemLevel[] = L"system_level"; + const wchar_t kVerboseLogging[] = L"verbose_logging"; + const wchar_t kExtensionsBlock[] = L"extensions.settings"; +} +} |