Hook up new API for easy unlock to update lock screen

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 <vector>
 
 #include "base/lazy_instance.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/screenlock_private.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/image_loader.h"
 #include "ui/gfx/image/image.h"
 
 namespace screenlock = extensions::api::screenlock_private;
 
 namespace extensions {
@@ skipping 73 matching lines @@
 
 ScreenlockPrivateShowMessageFunction::~ScreenlockPrivateShowMessageFunction() {}
 
 bool ScreenlockPrivateShowMessageFunction::RunAsync() {
   scoped_ptr<screenlock::ShowMessage::Params> params(
       screenlock::ShowMessage::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   ScreenlockBridge::LockHandler* locker =
       ScreenlockBridge::Get()->lock_handler();
   if (locker)
-    locker->ShowBannerMessage(params->message);
+    locker->ShowBannerMessage(base::UTF8ToUTF16(params->message));
   SendResponse(error_.empty());
   return true;
 }
 
 ScreenlockPrivateShowCustomIconFunction::
   ScreenlockPrivateShowCustomIconFunction() {}
 
 ScreenlockPrivateShowCustomIconFunction::
   ~ScreenlockPrivateShowCustomIconFunction() {}
 
@@ skipping 47 matching lines @@
       icon_info,
       base::Bind(&ScreenlockPrivateShowCustomIconFunction::OnImageLoaded,
                  this));
   return true;
 }
 
 void ScreenlockPrivateShowCustomIconFunction::OnImageLoaded(
     const gfx::Image& image) {
   ScreenlockBridge::LockHandler* locker =
       ScreenlockBridge::Get()->lock_handler();
+  if (!locker) {
+    SetError(kNotLockedError);
+    SendResponse(false);
+    return;
+  }
+
+  ScreenlockBridge::UserPodCustomIconOptions icon;
+  icon.SetIconAsImage(image);
   locker->ShowUserPodCustomIcon(
       ScreenlockBridge::GetAuthenticatedUserEmail(GetProfile()),
-      image);
+      icon);
   SendResponse(error_.empty());
 }
 
 ScreenlockPrivateHideCustomIconFunction::
     ScreenlockPrivateHideCustomIconFunction() {
 }
 
 ScreenlockPrivateHideCustomIconFunction::
     ~ScreenlockPrivateHideCustomIconFunction() {
 }
@@ skipping 21 matching lines @@
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   ScreenlockBridge::LockHandler* locker =
       ScreenlockBridge::Get()->lock_handler();
   if (locker) {
     std::string initial_value =
         params->initial_value.get() ? *(params->initial_value.get()) : "";
     locker->SetAuthType(
         ScreenlockBridge::GetAuthenticatedUserEmail(GetProfile()),
         ToLockHandlerAuthType(params->auth_type),
-        initial_value);
+        base::UTF8ToUTF16(initial_value));
   } else {
     SetError(kNotLockedError);
   }
   SendResponse(error_.empty());
   return true;
 }
 
 ScreenlockPrivateGetAuthTypeFunction::ScreenlockPrivateGetAuthTypeFunction() {}
 
 ScreenlockPrivateGetAuthTypeFunction::~ScreenlockPrivateGetAuthTypeFunction() {}
@@ skipping 88 matching lines @@
   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