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

Side by Side Diff: chrome/common/pref_names.cc

Issue 1312693005: Remove migration of obsolete value for "session.restore_on_startup". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@url-to-restore-on-startup
Patch Set: Re-enable the two tests Created 5 years 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 unified diff | Download patch
« no previous file with comments | « chrome/common/pref_names.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "chrome/common/pref_font_webkit_names.h" 8 #include "chrome/common/pref_font_webkit_names.h"
9 9
10 namespace prefs { 10 namespace prefs {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 // compatibility. 62 // compatibility.
63 const char kSessionExitedCleanly[] = "profile.exited_cleanly"; 63 const char kSessionExitedCleanly[] = "profile.exited_cleanly";
64 64
65 // A string pref whose values is one of the values defined by 65 // A string pref whose values is one of the values defined by
66 // |ProfileImpl::kPrefExitTypeXXX|. Set to |kPrefExitTypeCrashed| on startup and 66 // |ProfileImpl::kPrefExitTypeXXX|. Set to |kPrefExitTypeCrashed| on startup and
67 // one of |kPrefExitTypeNormal| or |kPrefExitTypeSessionEnded| during 67 // one of |kPrefExitTypeNormal| or |kPrefExitTypeSessionEnded| during
68 // shutdown. Used to determine the exit type the last time the profile was open. 68 // shutdown. Used to determine the exit type the last time the profile was open.
69 const char kSessionExitType[] = "profile.exit_type"; 69 const char kSessionExitType[] = "profile.exit_type";
70 70
71 // An integer pref. Holds one of several values: 71 // An integer pref. Holds one of several values:
72 // 0: (deprecated) open the homepage on startup. 72 // 0: unused, previously indicated to open the homepage on startup
73 // 1: restore the last session. 73 // 1: restore the last session.
74 // 2: this was used to indicate a specific session should be restored. It is 74 // 2: this was used to indicate a specific session should be restored. It is
75 // no longer used, but saved to avoid conflict with old preferences. 75 // no longer used, but saved to avoid conflict with old preferences.
76 // 3: unused, previously indicated the user wants to restore a saved session. 76 // 3: unused, previously indicated the user wants to restore a saved session.
77 // 4: restore the URLs defined in kURLsToRestoreOnStartup. 77 // 4: restore the URLs defined in kURLsToRestoreOnStartup.
78 // 5: open the New Tab Page on startup. 78 // 5: open the New Tab Page on startup.
79 const char kRestoreOnStartup[] = "session.restore_on_startup"; 79 const char kRestoreOnStartup[] = "session.restore_on_startup";
80 80
81 // A preference to keep track of whether we have already checked whether we
82 // need to migrate the user from kRestoreOnStartup=0 to kRestoreOnStartup=4.
83 // We only need to do this check once, on upgrade from m18 or lower to m19 or
84 // higher.
85 const char kRestoreOnStartupMigrated[] = "session.restore_on_startup_migrated";
86
87 // The URLs to restore on startup or when the home button is pressed. The URLs 81 // The URLs to restore on startup or when the home button is pressed. The URLs
88 // are only restored on startup if kRestoreOnStartup is 4. 82 // are only restored on startup if kRestoreOnStartup is 4.
89 const char kURLsToRestoreOnStartup[] = "session.startup_urls"; 83 const char kURLsToRestoreOnStartup[] = "session.startup_urls";
90 84
91 // Stores the email address associated with the google account of the custodian 85 // Stores the email address associated with the google account of the custodian
92 // of the supervised user, set when the supervised user is created. 86 // of the supervised user, set when the supervised user is created.
93 const char kSupervisedUserCustodianEmail[] = "profile.managed.custodian_email"; 87 const char kSupervisedUserCustodianEmail[] = "profile.managed.custodian_email";
94 88
95 // Stores the display name associated with the google account of the custodian 89 // Stores the display name associated with the google account of the custodian
96 // of the supervised user, updated (if possible) each time the supervised user 90 // of the supervised user, updated (if possible) each time the supervised user
(...skipping 2077 matching lines...) Expand 10 before | Expand all | Expand 10 after
2174 // Policy that indicates how to handle animated images. 2168 // Policy that indicates how to handle animated images.
2175 const char kAnimationPolicy[] = "settings.a11y.animation_policy"; 2169 const char kAnimationPolicy[] = "settings.a11y.animation_policy";
2176 #endif 2170 #endif
2177 2171
2178 const char kBackgroundTracingLastUpload[] = "background_tracing.last_upload"; 2172 const char kBackgroundTracingLastUpload[] = "background_tracing.last_upload";
2179 2173
2180 const char kAllowDinosaurEasterEgg[] = 2174 const char kAllowDinosaurEasterEgg[] =
2181 "allow_dinosaur_easter_egg"; 2175 "allow_dinosaur_easter_egg";
2182 2176
2183 } // namespace prefs 2177 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698