summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-20 18:13:07 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-20 18:13:07 +0000
commitc8d4b1ebcb97834daa9ebb42ce9d3f625b55b2a8 (patch)
treece3c7c1d7daa5504b1f9a3554a84f3ca660d776f /extensions
parent971cc68d9d4432ad4e9a942fbe4ae7e61ba2d16f (diff)
downloadchromium_src-c8d4b1ebcb97834daa9ebb42ce9d3f625b55b2a8.zip
chromium_src-c8d4b1ebcb97834daa9ebb42ce9d3f625b55b2a8.tar.gz
chromium_src-c8d4b1ebcb97834daa9ebb42ce9d3f625b55b2a8.tar.bz2
cros: Clean up screenlockPrivate plumbing.
- Make SigninScreenHandler a ScreenlockBidge::LockHandler and get rid of middle layers; - Remove deprecated custom button click; - customButton -> customIcon renaming and HTML/js/css update; - Move api test out of cros; R=asargent@chromium.org, isherman@chromium.org, rogerta@chromium.org, tengs@chromium.org Review URL: https://codereview.chromium.org/289013002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271714 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r--extensions/browser/extension_function_histogram_value.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/browser/extension_function_histogram_value.h b/extensions/browser/extension_function_histogram_value.h
index 9e12313..d9e091f 100644
--- a/extensions/browser/extension_function_histogram_value.h
+++ b/extensions/browser/extension_function_histogram_value.h
@@ -710,7 +710,7 @@ enum HistogramValue {
MEDIAGALLERIES_GETMETADATA,
INPUT_IME_SENDKEYEVENTS,
VIRTUALKEYBOARDPRIVATE_LOCKKEYBOARD,
- SCREENLOCKPRIVATE_SHOWBUTTON,
+ SCREENLOCKPRIVATE_SHOWCUSTOMICON,
INPUT_IME_HIDEINPUTVIEW,
BOOKMARKMANAGERPRIVATE_UNDO,
BOOKMARKMANAGERPRIVATE_REDO,
@@ -747,7 +747,7 @@ enum HistogramValue {
ACTIVITYLOGPRIVATE_DELETEACTIVITIES,
NETWORKINGPRIVATE_SETWIFITDLSENABLEDSTATE,
NETWORKINGPRIVATE_GETWIFITDLSSTATUS,
- SCREENLOCKPRIVATE_HIDEBUTTON,
+ SCREENLOCKPRIVATE_HIDECUSTOMICON,
SCREENLOCKPRIVATE_SETAUTHTYPE,
SCREENLOCKPRIVATE_GETAUTHTYPE,
SCREENLOCKPRIVATE_ACCEPTAUTHATTEMPT,