Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(314)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/installer/util/master_preferences.h

Issue 155063: Merge r18210.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/branches/172/src/
Patch Set: Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/util/google_chrome_distribution_unittest.cc ('k') | chrome/installer/util/master_preferences.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/master_preferences.h
===================================================================
--- chrome/installer/util/master_preferences.h (revision 19709)
+++ chrome/installer/util/master_preferences.h (working copy)
@@ -53,7 +53,11 @@
// Show the EULA and do not install if not accepted.
MASTER_PROFILE_REQUIRE_EULA = 0x1 << 13,
// Use an alternate description text for some shortcuts.
- MASTER_PROFILE_ALT_SHORTCUT_TXT = 0x1 << 14
+ MASTER_PROFILE_ALT_SHORTCUT_TXT = 0x1 << 14,
+ // Use a smaller OEM info bubble on first run.
+ MASTER_PROFILE_OEM_FIRST_RUN_BUBBLE = 0x1 << 15,
+ // Import home page from the default browser.
+ MASTER_PROFILE_IMPORT_HOME_PAGE = 0x1 << 16
};
// The master preferences is a JSON file with the same entries as the
@@ -69,6 +73,7 @@
// "import_search_engine": true,
// "import_history": false,
// "import_bookmarks": false,
+// "import_home_page": false,
// "create_all_shortcuts": true,
// "do_not_launch_chrome": false,
// "make_chrome_default": false,
« no previous file with comments | « chrome/installer/util/google_chrome_distribution_unittest.cc ('k') | chrome/installer/util/master_preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698