cros: Clean up screenlockPrivate plumbing.

chrome/browser/signin/screenlock_bridge.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_SIGNIN_SCREENLOCK_BRIDGE_H_
 #define CHROME_BROWSER_SIGNIN_SCREENLOCK_BRIDGE_H_
 
-#include "base/callback_forward.h"
+#include <string>
+
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 
 namespace gfx {
 class Image;
 }
 
 class Profile;
 
@@ skipping 19 matching lines @@
     enum AuthType {
       OFFLINE_PASSWORD = 0,
       ONLINE_SIGN_IN = 1,
       NUMERIC_PIN = 2,
       USER_CLICK = 3,
     };
 
     // Displays |message| in a banner on the lock screen.
     virtual void ShowBannerMessage(const std::string& message) = 0;
 
-    // Shows a button inside the user pod on the lock screen with an icon.
-    // |callback| is invoked when the icon is clicked. This is deprecated now.
-    virtual void ShowUserPodButton(const std::string& user_email,
-                                   const gfx::Image& icon,
-                                   const base::Closure& callback) = 0;
+    // Shows a custom icon in the user pod on the lock screen.
+    virtual void ShowUserPodCustomIcon(const std::string& user_email,
+                                       const gfx::Image& icon) = 0;
 
-    // Hides the user pod button for a user.
-    virtual void HideUserPodButton(const std::string& user_email) = 0;
+    // Hides the custom icon in user pod for a user.
+    virtual void HideUserPodCustomIcon(const std::string& user_email) = 0;
 
     // (Re)enable lock screen UI.
     virtual void EnableInput() = 0;
 
     // Set the authentication type to be used on the lock screen.
     virtual void SetAuthType(const std::string& user_email,
                              AuthType auth_type,
                              const std::string& auth_value) = 0;
 
     // Returns the authentication type used for a user.
@@ skipping 27 matching lines @@
   ScreenlockBridge();
   ~ScreenlockBridge();
 
   LockHandler* lock_handler_;  // Not owned
   ObserverList<Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenlockBridge);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_SCREENLOCK_BRIDGE_H_