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

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, 8 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 706 matching lines...) Expand 10 before | Expand all | Expand 10 after
717 const char kCurrentThemeDisplayProperties[] = "extensions.theme.properties"; 717 const char kCurrentThemeDisplayProperties[] = "extensions.theme.properties";
718 718
719 // Boolean pref which persists whether the extensions_ui is in developer mode 719 // Boolean pref which persists whether the extensions_ui is in developer mode
720 // (showing developer packing tools and extensions details) 720 // (showing developer packing tools and extensions details)
721 const char kExtensionsUIDeveloperMode[] = "extensions.ui.developer_mode"; 721 const char kExtensionsUIDeveloperMode[] = "extensions.ui.developer_mode";
722 722
723 // Integer pref that tracks the number of browser actions visible in the browser 723 // Integer pref that tracks the number of browser actions visible in the browser
724 // actions toolbar. 724 // actions toolbar.
725 const char kExtensionToolbarSize[] = "extensions.toolbarsize"; 725 const char kExtensionToolbarSize[] = "extensions.toolbarsize";
726 726
727 // Dictionary pref that tracks which keybinding belongs to which
728 // extension + named command pair.
729 const char kExtensionKeybindings[] = "extensions.keybindings";
730
727 // Pref containing the directory for internal plugins as written to the plugins 731 // Pref containing the directory for internal plugins as written to the plugins
728 // list (below). 732 // list (below).
729 const char kPluginsLastInternalDirectory[] = "plugins.last_internal_directory"; 733 const char kPluginsLastInternalDirectory[] = "plugins.last_internal_directory";
730 734
731 // List pref containing information (dictionaries) on plugins. 735 // List pref containing information (dictionaries) on plugins.
732 const char kPluginsPluginsList[] = "plugins.plugins_list"; 736 const char kPluginsPluginsList[] = "plugins.plugins_list";
733 737
734 // List pref containing names of plugins that are disabled by policy. 738 // List pref containing names of plugins that are disabled by policy.
735 const char kPluginsDisabledPlugins[] = "plugins.plugins_disabled"; 739 const char kPluginsDisabledPlugins[] = "plugins.plugins_disabled";
736 740
(...skipping 1105 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