cros: Clean up screenlockPrivate plumbing.

chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc

 // Copyright 2013 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/browser/extensions/api/screenlock_private/screenlock_private_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 79 matching lines @@
       screenlock::ShowMessage::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   ScreenlockBridge::LockHandler* locker =
       ScreenlockBridge::Get()->lock_handler();
   if (locker)
     locker->ShowBannerMessage(params->message);
   SendResponse(error_.empty());
   return true;
 }
 
-static const int kMaxButtonIconSize = 40;
+ScreenlockPrivateShowCustomIconFunction::
+  ScreenlockPrivateShowCustomIconFunction() {}
 
-ScreenlockPrivateShowButtonFunction::
-  ScreenlockPrivateShowButtonFunction() {}
+ScreenlockPrivateShowCustomIconFunction::
+  ~ScreenlockPrivateShowCustomIconFunction() {}
 
-ScreenlockPrivateShowButtonFunction::
-  ~ScreenlockPrivateShowButtonFunction() {}
-
-bool ScreenlockPrivateShowButtonFunction::RunAsync() {
-  scoped_ptr<screenlock::ShowButton::Params> params(
-      screenlock::ShowButton::Params::Create(*args_));
+bool ScreenlockPrivateShowCustomIconFunction::RunAsync() {
+  scoped_ptr<screenlock::ShowCustomIcon::Params> params(
+      screenlock::ShowCustomIcon::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   ScreenlockBridge::LockHandler* locker =
       ScreenlockBridge::Get()->lock_handler();
   if (!locker) {
     SetError(kNotLockedError);
     SendResponse(false);
     return true;
   }
+
+  const int kMaxButtonIconSize = 40;
   extensions::ImageLoader* loader = extensions::ImageLoader::Get(GetProfile());
   loader->LoadImageAsync(
-      GetExtension(), GetExtension()->GetResource(params->icon),
+      GetExtension(),
+      GetExtension()->GetResource(params->icon),
       gfx::Size(kMaxButtonIconSize, kMaxButtonIconSize),
-      base::Bind(&ScreenlockPrivateShowButtonFunction::OnImageLoaded, this));
+      base::Bind(&ScreenlockPrivateShowCustomIconFunction::OnImageLoaded,
+                 this));
   return true;
 }
 
-void ScreenlockPrivateShowButtonFunction::OnImageLoaded(
+void ScreenlockPrivateShowCustomIconFunction::OnImageLoaded(
     const gfx::Image& image) {
   ScreenlockBridge::LockHandler* locker =
       ScreenlockBridge::Get()->lock_handler();
-  ScreenlockPrivateEventRouter* router =
-      ScreenlockPrivateEventRouter::GetFactoryInstance()->Get(GetProfile());
-  locker->ShowUserPodButton(
+  locker->ShowUserPodCustomIcon(
       ScreenlockBridge::GetAuthenticatedUserEmail(GetProfile()),
-      image,
-      base::Bind(&ScreenlockPrivateEventRouter::OnButtonClicked,
-                 base::Unretained(router)));
+      image);
   SendResponse(error_.empty());
 }
 
-ScreenlockPrivateHideButtonFunction::ScreenlockPrivateHideButtonFunction() {}
+ScreenlockPrivateHideCustomIconFunction::
+    ScreenlockPrivateHideCustomIconFunction() {
+}
 
-ScreenlockPrivateHideButtonFunction::~ScreenlockPrivateHideButtonFunction() {}
+ScreenlockPrivateHideCustomIconFunction::
+    ~ScreenlockPrivateHideCustomIconFunction() {
+}
 
-bool ScreenlockPrivateHideButtonFunction::RunAsync() {
+bool ScreenlockPrivateHideCustomIconFunction::RunAsync() {
   ScreenlockBridge::LockHandler* locker =
       ScreenlockBridge::Get()->lock_handler();
   if (locker) {
-    locker->HideUserPodButton(
+    locker->HideUserPodCustomIcon(
         ScreenlockBridge::GetAuthenticatedUserEmail(GetProfile()));
   } else {
     SetError(kNotLockedError);
   }
   SendResponse(error_.empty());
   return true;
 }
 
 ScreenlockPrivateSetAuthTypeFunction::ScreenlockPrivateSetAuthTypeFunction() {}
 
@@ skipping 101 matching lines @@
 // static
 extensions::BrowserContextKeyedAPIFactory<ScreenlockPrivateEventRouter>*
 ScreenlockPrivateEventRouter::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 void ScreenlockPrivateEventRouter::Shutdown() {
   ScreenlockBridge::Get()->RemoveObserver(this);
 }
 
-void ScreenlockPrivateEventRouter::OnButtonClicked() {
-  DispatchEvent(screenlock::OnButtonClicked::kEventName, NULL);
-}
-
 void ScreenlockPrivateEventRouter::OnAuthAttempted(
     ScreenlockBridge::LockHandler::AuthType auth_type,
     const std::string& value) {
   scoped_ptr<base::ListValue> args(new base::ListValue());
   args->AppendString(screenlock::ToString(FromLockHandlerAuthType(auth_type)));
   args->AppendString(value);
 
   scoped_ptr<extensions::Event> event(new extensions::Event(
       screenlock::OnAuthAttempted::kEventName, args.Pass()));
   extensions::EventRouter::Get(browser_context_)->BroadcastEvent(event.Pass());
 }
 
 }  // namespace extensions