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

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

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
« no previous file with comments | « chrome/common/extensions/extension.cc ('k') | chrome/common/pref_names.cc » ('j') | 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 // Constants for the names of various preferences, for easier changing. 5 // Constants for the names of various preferences, for easier changing.
6 6
7 #ifndef CHROME_COMMON_PREF_NAMES_H_ 7 #ifndef CHROME_COMMON_PREF_NAMES_H_
8 #define CHROME_COMMON_PREF_NAMES_H_ 8 #define CHROME_COMMON_PREF_NAMES_H_
9 #pragma once 9 #pragma once
10 10
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 extern const char kUsesSystemTheme[]; 265 extern const char kUsesSystemTheme[];
266 #endif 266 #endif
267 extern const char kCurrentThemePackFilename[]; 267 extern const char kCurrentThemePackFilename[];
268 extern const char kCurrentThemeID[]; 268 extern const char kCurrentThemeID[];
269 extern const char kCurrentThemeImages[]; 269 extern const char kCurrentThemeImages[];
270 extern const char kCurrentThemeColors[]; 270 extern const char kCurrentThemeColors[];
271 extern const char kCurrentThemeTints[]; 271 extern const char kCurrentThemeTints[];
272 extern const char kCurrentThemeDisplayProperties[]; 272 extern const char kCurrentThemeDisplayProperties[];
273 extern const char kExtensionsUIDeveloperMode[]; 273 extern const char kExtensionsUIDeveloperMode[];
274 extern const char kExtensionToolbarSize[]; 274 extern const char kExtensionToolbarSize[];
275 extern const char kExtensionKeybindings[];
275 extern const char kPluginsLastInternalDirectory[]; 276 extern const char kPluginsLastInternalDirectory[];
276 extern const char kPluginsPluginsList[]; 277 extern const char kPluginsPluginsList[];
277 extern const char kPluginsDisabledPlugins[]; 278 extern const char kPluginsDisabledPlugins[];
278 extern const char kPluginsDisabledPluginsExceptions[]; 279 extern const char kPluginsDisabledPluginsExceptions[];
279 extern const char kPluginsEnabledPlugins[]; 280 extern const char kPluginsEnabledPlugins[];
280 extern const char kPluginsEnabledInternalPDF[]; 281 extern const char kPluginsEnabledInternalPDF[];
281 extern const char kPluginsEnabledNaCl[]; 282 extern const char kPluginsEnabledNaCl[];
282 extern const char kPluginsShowSetReaderDefaultInfobar[]; 283 extern const char kPluginsShowSetReaderDefaultInfobar[];
283 extern const char kPluginsShowDetails[]; 284 extern const char kPluginsShowDetails[];
284 extern const char kPluginsAllowOutdated[]; 285 extern const char kPluginsAllowOutdated[];
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 extern const char kPointsBufferedForVelocity[]; 690 extern const char kPointsBufferedForVelocity[];
690 extern const char kRailBreakProportion[]; 691 extern const char kRailBreakProportion[];
691 extern const char kRailStartProportion[]; 692 extern const char kRailStartProportion[];
692 #endif 693 #endif
693 694
694 extern const char kInManagedMode[]; 695 extern const char kInManagedMode[];
695 696
696 } // namespace prefs 697 } // namespace prefs
697 698
698 #endif // CHROME_COMMON_PREF_NAMES_H_ 699 #endif // CHROME_COMMON_PREF_NAMES_H_
OLDNEW
« no previous file with comments | « chrome/common/extensions/extension.cc ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698