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

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: Addressed comments 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 717 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 const char kCurrentThemeDisplayProperties[] = "extensions.theme.properties"; 728 const char kCurrentThemeDisplayProperties[] = "extensions.theme.properties";
729 729
730 // Boolean pref which persists whether the extensions_ui is in developer mode 730 // Boolean pref which persists whether the extensions_ui is in developer mode
731 // (showing developer packing tools and extensions details) 731 // (showing developer packing tools and extensions details)
732 const char kExtensionsUIDeveloperMode[] = "extensions.ui.developer_mode"; 732 const char kExtensionsUIDeveloperMode[] = "extensions.ui.developer_mode";
733 733
734 // Integer pref that tracks the number of browser actions visible in the browser 734 // Integer pref that tracks the number of browser actions visible in the browser
735 // actions toolbar. 735 // actions toolbar.
736 const char kExtensionToolbarSize[] = "extensions.toolbarsize"; 736 const char kExtensionToolbarSize[] = "extensions.toolbarsize";
737 737
738 // Dictionary pref that tracks which keybinding belongs to which
739 // extension + named command pair.
740 const char kExtensionKeybindings[] = "extensions.keybindings";
741
738 // Pref containing the directory for internal plugins as written to the plugins 742 // Pref containing the directory for internal plugins as written to the plugins
739 // list (below). 743 // list (below).
740 const char kPluginsLastInternalDirectory[] = "plugins.last_internal_directory"; 744 const char kPluginsLastInternalDirectory[] = "plugins.last_internal_directory";
741 745
742 // List pref containing information (dictionaries) on plugins. 746 // List pref containing information (dictionaries) on plugins.
743 const char kPluginsPluginsList[] = "plugins.plugins_list"; 747 const char kPluginsPluginsList[] = "plugins.plugins_list";
744 748
745 // List pref containing names of plugins that are disabled by policy. 749 // List pref containing names of plugins that are disabled by policy.
746 const char kPluginsDisabledPlugins[] = "plugins.plugins_disabled"; 750 const char kPluginsDisabledPlugins[] = "plugins.plugins_disabled";
747 751
(...skipping 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after
1843 const char kRailBreakProportion[] = 1847 const char kRailBreakProportion[] =
1844 "gesture.rail_break_proportion"; 1848 "gesture.rail_break_proportion";
1845 const char kRailStartProportion[] = 1849 const char kRailStartProportion[] =
1846 "gesture.rail_start_proportion"; 1850 "gesture.rail_start_proportion";
1847 #endif 1851 #endif
1848 1852
1849 // Indicates whether the browser is in managed mode. 1853 // Indicates whether the browser is in managed mode.
1850 const char kInManagedMode[] = "managed_mode"; 1854 const char kInManagedMode[] = "managed_mode";
1851 1855
1852 } // namespace prefs 1856 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/test/data/extensions/api_test/keybinding/conflicting/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698