Hook up new API for easy unlock to update lock screen

chrome/browser/signin/screenlock_bridge.cc

Index: chrome/browser/signin/screenlock_bridge.cc
diff --git a/chrome/browser/signin/screenlock_bridge.cc b/chrome/browser/signin/screenlock_bridge.cc
index 995b1d9463e114cac4b378503ff63f05015032f2..646b760974536a3592993e624993fcb56cc47869 100644
--- a/chrome/browser/signin/screenlock_bridge.cc
+++ b/chrome/browser/signin/screenlock_bridge.cc
@@ -5,9 +5,13 @@
 #include "chrome/browser/signin/screenlock_bridge.h"
 
 #include "base/logging.h"
+#include "base/strings/string16.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "components/signin/core/browser/signin_manager.h"
+#include "ui/base/webui/web_ui_util.h"
+#include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ -26,6 +30,106 @@ ScreenlockBridge* ScreenlockBridge::Get() {
   return g_screenlock_bridge_bridge_instance.Pointer();
 }
 
+ScreenlockBridge::UserPodCustomIconOptions::UserPodCustomIconOptions()
+    : width_(0u),
+      height_(0u),
+      animation_set_(false),
+      animation_resource_width_(0u),
+      animation_frame_length_ms_(0u),
+      opacity_(100u),
+      autoshow_tooltip_(false) {
+}
+
+ScreenlockBridge::UserPodCustomIconOptions::~UserPodCustomIconOptions() {}
+
+scoped_ptr<base::DictionaryValue>
+ScreenlockBridge::UserPodCustomIconOptions::ToDictionaryValue() const {
+  scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
+  if (!icon_image_ && !icon_resource_url_)
+    return result.Pass();
+
+  if (icon_image_) {
+    gfx::ImageSkia icon_skia = icon_image_->AsImageSkia();
+    base::DictionaryValue* icon_representations = new base::DictionaryValue();
+    icon_representations->SetString(
+        "scale1x",
+        webui::GetBitmapDataUrl(
+            icon_skia.GetRepresentation(1.0f).sk_bitmap()));
+    icon_representations->SetString(
+        "scale2x",
+        webui::GetBitmapDataUrl(
+            icon_skia.GetRepresentation(2.0f).sk_bitmap()));
+    result->Set("data", icon_representations);
+  } else {
+    result->SetString("resourceUrl", *icon_resource_url_);
+  }
+
+  if (tooltip_) {
+    base::DictionaryValue* tooltip_options = new base::DictionaryValue();
+    tooltip_options->SetString("text", *tooltip_);
+    tooltip_options->SetBoolean("autoshow", autoshow_tooltip_);
+    result->Set("tooltip", tooltip_options);
+  }
+
+  base::DictionaryValue* size = new base::DictionaryValue();
+  size->SetInteger("height", height_);
+  size->SetInteger("width", width_);
+  result->Set("size", size);
+
+  result->SetInteger("opacity", opacity_);
+
+  if (animation_set_) {
+    base::DictionaryValue* animation = new base::DictionaryValue();
+    animation->SetInteger("resourceWidth",
+                          animation_resource_width_);
+    animation->SetInteger("frameLengthMs",
+                          animation_frame_length_ms_);
+    result->Set("animation", animation);
+  }
+  return result.Pass();
+}
+
+void ScreenlockBridge::UserPodCustomIconOptions::SetIconAsResourceURL(
+    const std::string& url) {
+  DCHECK(!icon_image_);
+
+  icon_resource_url_.reset(new std::string(url));
+}
+
+void ScreenlockBridge::UserPodCustomIconOptions::SetIconAsImage(
+    const gfx::Image& image) {
+  DCHECK(!icon_resource_url_);
+
+  icon_image_.reset(new gfx::Image(image));
+  SetSize(image.Width(), image.Height());
+}
+
+void ScreenlockBridge::UserPodCustomIconOptions::SetSize(size_t icon_width,
+                                                         size_t icon_height) {
+  width_ = icon_width;
+  height_ = icon_height;
+}
+
+void ScreenlockBridge::UserPodCustomIconOptions::SetAnimation(
+    size_t resource_width,
+    size_t frame_length_ms) {
+  animation_set_ = true;
+  animation_resource_width_ = resource_width;
+  animation_frame_length_ms_ = frame_length_ms;
+}
+
+void ScreenlockBridge::UserPodCustomIconOptions::SetOpacity(size_t opacity) {
+  DCHECK_LE(opacity, 100u);
+  opacity_ = opacity;
+}
+
+void ScreenlockBridge::UserPodCustomIconOptions::SetTooltip(
+    const base::string16& tooltip,
+    bool autoshow) {
+  tooltip_.reset(new base::string16(tooltip));
+  autoshow_tooltip_ = autoshow;
+}
+
 // static
 std::string ScreenlockBridge::GetAuthenticatedUserEmail(Profile* profile) {
   // |profile| has to be a signed-in profile with SigninManager already