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

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

Issue 15969017: Warn by default when certain DLL conflicts exist on XP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ready for try servers Created 7 years, 6 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 #include "chrome/common/pref_font_webkit_names.h" 8 #include "chrome/common/pref_font_webkit_names.h"
9 9
10 namespace prefs { 10 namespace prefs {
(...skipping 2454 matching lines...) Expand 10 before | Expand all | Expand 10 after
2465 // The number of times the app launcher was launched since last ping and 2465 // The number of times the app launcher was launched since last ping and
2466 // the time of the last ping. 2466 // the time of the last ping.
2467 extern const char kAppListLaunchCount[] = "app_list.launch_count"; 2467 extern const char kAppListLaunchCount[] = "app_list.launch_count";
2468 extern const char kLastAppListLaunchPing[] = "app_list.last_launch_ping"; 2468 extern const char kLastAppListLaunchPing[] = "app_list.last_launch_ping";
2469 2469
2470 // The number of times the an app was launched from the app launcher since last 2470 // The number of times the an app was launched from the app launcher since last
2471 // ping and the time of the last ping. 2471 // ping and the time of the last ping.
2472 extern const char kAppListAppLaunchCount[] = "app_list.app_launch_count"; 2472 extern const char kAppListAppLaunchCount[] = "app_list.app_launch_count";
2473 extern const char kLastAppListAppLaunchPing[] = "app_list.last_app_launch_ping"; 2473 extern const char kLastAppListAppLaunchPing[] = "app_list.last_app_launch_ping";
2474 2474
2475 // How often the bubble has been shown.
2476 extern const char kModuleConflictBubbleShown[] = "module_conflict.bubble_shown";
2477
2475 // A string pref for storing the salt used to compute the pepper device ID. 2478 // A string pref for storing the salt used to compute the pepper device ID.
2476 const char kDRMSalt[] = "settings.privacy.drm_salt"; 2479 const char kDRMSalt[] = "settings.privacy.drm_salt";
2477 // A boolean pref that enables the (private) pepper GetDeviceID() call. 2480 // A boolean pref that enables the (private) pepper GetDeviceID() call.
2478 const char kEnableDRM[] = "settings.privacy.drm_enabled"; 2481 const char kEnableDRM[] = "settings.privacy.drm_enabled";
2479 2482
2480 } // namespace prefs 2483 } // namespace prefs
OLDNEW
« chrome/browser/ui/views/conflicting_module_view_win.cc ('K') | « chrome/common/pref_names.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698