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

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

Issue 10201016: Conflict detection for Extension Keybinding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 unified diff | Download patch | Annotate | Revision Log
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 8
9 namespace prefs { 9 namespace prefs {
10 10
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
724 const char kCurrentThemeDisplayProperties[] = "extensions.theme.properties"; 724 const char kCurrentThemeDisplayProperties[] = "extensions.theme.properties";
725 725
726 // Boolean pref which persists whether the extensions_ui is in developer mode 726 // Boolean pref which persists whether the extensions_ui is in developer mode
727 // (showing developer packing tools and extensions details) 727 // (showing developer packing tools and extensions details)
728 const char kExtensionsUIDeveloperMode[] = "extensions.ui.developer_mode"; 728 const char kExtensionsUIDeveloperMode[] = "extensions.ui.developer_mode";
729 729
730 // Integer pref that tracks the number of browser actions visible in the browser 730 // Integer pref that tracks the number of browser actions visible in the browser
731 // actions toolbar. 731 // actions toolbar.
732 const char kExtensionToolbarSize[] = "extensions.toolbarsize"; 732 const char kExtensionToolbarSize[] = "extensions.toolbarsize";
733 733
734 // Dictionary pref that tracks which keybinding belongs to which
735 // extension + named command pair.
736 const char kExtensionKeybindings[] = "extensions.keybindings";
737
734 // Pref containing the directory for internal plugins as written to the plugins 738 // Pref containing the directory for internal plugins as written to the plugins
735 // list (below). 739 // list (below).
736 const char kPluginsLastInternalDirectory[] = "plugins.last_internal_directory"; 740 const char kPluginsLastInternalDirectory[] = "plugins.last_internal_directory";
737 741
738 // List pref containing information (dictionaries) on plugins. 742 // List pref containing information (dictionaries) on plugins.
739 const char kPluginsPluginsList[] = "plugins.plugins_list"; 743 const char kPluginsPluginsList[] = "plugins.plugins_list";
740 744
741 // List pref containing names of plugins that are disabled by policy. 745 // List pref containing names of plugins that are disabled by policy.
742 const char kPluginsDisabledPlugins[] = "plugins.plugins_disabled"; 746 const char kPluginsDisabledPlugins[] = "plugins.plugins_disabled";
743 747
(...skipping 1098 matching lines...) Expand 10 before | Expand all | Expand 10 after
1842 const char kRailBreakProportion[] = 1846 const char kRailBreakProportion[] =
1843 "gesture.rail_break_proportion"; 1847 "gesture.rail_break_proportion";
1844 const char kRailStartProportion[] = 1848 const char kRailStartProportion[] =
1845 "gesture.rail_start_proportion"; 1849 "gesture.rail_start_proportion";
1846 #endif 1850 #endif
1847 1851
1848 // Indicates whether the browser is in managed mode. 1852 // Indicates whether the browser is in managed mode.
1849 const char kInManagedMode[] = "managed_mode"; 1853 const char kInManagedMode[] = "managed_mode";
1850 1854
1851 } // namespace prefs 1855 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698