Merge 250467 "Revert of Add UMA to track app launcher discoverab..."

chrome/common/pref_names.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/pref_names.h"
 
 #include "base/basictypes.h"
 #include "chrome/common/pref_font_webkit_names.h"
 
 namespace prefs {
@@ skipping 2530 matching lines @@
 #if defined(OS_CHROMEOS)
 // The RLZ brand code, if enabled.
 const char kRLZBrand[] = "rlz.brand";
 // Whether RLZ pings are disabled.
 const char kRLZDisabled[] = "rlz.disabled";
 #endif
 
 #if defined(ENABLE_APP_LIST)
 // The directory in user data dir that contains the profile to be used with the
 // app launcher.
-const char kAppListProfile[] = "app_list.profile";
+extern const char kAppListProfile[] = "app_list.profile";
 
 // Whether to show the app list on a browser relaunch. Used when switching out
 // of metro mode after a user gesture requests showing the app list.
 const char kRestartWithAppList[] = "app_list.show_on_relaunch";
 
 // The number of times the app launcher was launched since last ping and
 // the time of the last ping.
-const char kAppListLaunchCount[] = "app_list.launch_count";
-const char kLastAppListLaunchPing[] = "app_list.last_launch_ping";
+extern const char kAppListLaunchCount[] = "app_list.launch_count";
+extern const char kLastAppListLaunchPing[] = "app_list.last_launch_ping";
 
 // The number of times the an app was launched from the app launcher since last
 // ping and the time of the last ping.
-const char kAppListAppLaunchCount[] = "app_list.app_launch_count";
-const char kLastAppListAppLaunchPing[] = "app_list.last_app_launch_ping";
+extern const char kAppListAppLaunchCount[] = "app_list.app_launch_count";
+extern const char kLastAppListAppLaunchPing[] = "app_list.last_app_launch_ping";
 
 // A boolean that tracks whether the user has ever enabled the app launcher.
 const char kAppLauncherHasBeenEnabled[] =
     "apps.app_launcher.has_been_enabled";
 
-// An enum indicating how the app launcher was enabled. E.g., via webstore, app
-// install, command line, etc. For UMA.
-const char kAppListEnableMethod[] = "app_list.how_enabled";
-
-// The time that the app launcher was enabled. Cleared when UMA is recorded.
-const char kAppListEnableTime[] = "app_list.when_enabled";
-
 // TODO(calamity): remove this pref since app launcher will always be
 // installed.
 // Local state caching knowledge of whether the app launcher is installed.
 const char kAppLauncherIsEnabled[] =
     "apps.app_launcher.should_show_apps_page";
 
 // Integer representing the version of the app launcher shortcut installed on
 // the system. Incremented, e.g., when embedded icons change.
 const char kAppLauncherShortcutVersion[] = "apps.app_launcher.shortcut_version";
 
@@ skipping 61 matching lines @@
 
 // The number of seconds since epoch that the OS password was last changed.
 const char kOsPasswordLastChanged[] =
     "password_manager.os_password_last_changed";
 #endif
 
 // Whether DNS Quick Check is disabled in proxy resolution.
 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled";
 
 }  // namespace prefs