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

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

Issue 5368002: Move Mac LaunchOnStartup enable/disable to File thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed previous attempt to resolve merge conflict Created 10 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 | Annotate | Revision Log
« 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 namespace prefs { 7 namespace prefs {
8 8
9 // *************** PROFILE PREFS *************** 9 // *************** PROFILE PREFS ***************
10 // These are attached to the user profile 10 // These are attached to the user profile
(...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after
752 const char kKeywordEditorWindowPlacement[] = "keyword_editor.window_placement"; 752 const char kKeywordEditorWindowPlacement[] = "keyword_editor.window_placement";
753 753
754 // A collection of position, size, and other data relating to the preferences 754 // A collection of position, size, and other data relating to the preferences
755 // window to restore on startup. 755 // window to restore on startup.
756 const char kPreferencesWindowPlacement[] = "preferences.window_placement"; 756 const char kPreferencesWindowPlacement[] = "preferences.window_placement";
757 757
758 // An integer specifying the total number of bytes to be used by the 758 // An integer specifying the total number of bytes to be used by the
759 // renderer's in-memory cache of objects. 759 // renderer's in-memory cache of objects.
760 const char kMemoryCacheSize[] = "renderer.memory_cache.size"; 760 const char kMemoryCacheSize[] = "renderer.memory_cache.size";
761 761
762 // Boolean that records if chrome has set "launch on startup" property for
763 // itself earlier and is allowed to reset it later, reducing likelihood of
764 // overriding user choices.
765 const char kLaunchOnStartupResetAllowed[] = "launch_on_startup_reset_allowed";
766
767 // String which specifies where to download files to by default. 762 // String which specifies where to download files to by default.
768 const char kDownloadDefaultDirectory[] = "download.default_directory"; 763 const char kDownloadDefaultDirectory[] = "download.default_directory";
769 764
770 // Boolean that records if the download directory was changed by an 765 // Boolean that records if the download directory was changed by an
771 // upgrade a unsafe location to a safe location. 766 // upgrade a unsafe location to a safe location.
772 const char kDownloadDirUpgraded[] = "download.directory_upgrade"; 767 const char kDownloadDirUpgraded[] = "download.directory_upgrade";
773 768
774 // String which specifies where to save html files to by default. 769 // String which specifies where to save html files to by default.
775 const char kSaveFileDefaultDirectory[] = "savefile.default_directory"; 770 const char kSaveFileDefaultDirectory[] = "savefile.default_directory";
776 771
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
1123 const char kManagedDefaultPluginsSetting[] = 1118 const char kManagedDefaultPluginsSetting[] =
1124 "profile.managed_default_content_settings.plugins"; 1119 "profile.managed_default_content_settings.plugins";
1125 const char kManagedDefaultPopupsSetting[] = 1120 const char kManagedDefaultPopupsSetting[] =
1126 "profile.managed_default_content_settings.popups"; 1121 "profile.managed_default_content_settings.popups";
1127 1122
1128 // Dictionary for storing the set of known background pages (keys are extension 1123 // Dictionary for storing the set of known background pages (keys are extension
1129 // IDs of background page owners, value is a boolean that is true if the user 1124 // IDs of background page owners, value is a boolean that is true if the user
1130 // needs to acknowledge this page. 1125 // needs to acknowledge this page.
1131 const char kKnownBackgroundPages[] = "background_pages.known"; 1126 const char kKnownBackgroundPages[] = "background_pages.known";
1132 } // namespace prefs 1127 } // 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