Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / signin / screenlock_bridge.cc

diff --git a/src/chrome/browser/signin/screenlock_bridge.cc b/src/chrome/browser/signin/screenlock_bridge.cc
index 17d676b..1883814 100644 (file)
--- a/src/chrome/browser/signin/screenlock_bridge.cc
+++ b/src/chrome/browser/signin/screenlock_bridge.cc
@@ -20,6 +20,37 @@ namespace {
 base::LazyInstance<ScreenlockBridge> g_screenlock_bridge_bridge_instance =
     LAZY_INSTANCE_INITIALIZER;
 
+// Ids for the icons that are supported by lock screen and signin screen
+// account picker as user pod custom icons.
+// The id's should be kept in sync with values used by user_pod_row.js.
+const char kLockedUserPodCustomIconId[] = "locked";
+const char kLockedToBeActivatedUserPodCustomIconId[] = "locked-to-be-activated";
+const char kLockedWithProximityHintUserPodCustomIconId[] =
+    "locked-with-proximity-hint";
+const char kUnlockedUserPodCustomIconId[] = "unlocked";
+const char kHardlockedUserPodCustomIconId[] = "hardlocked";
+const char kSpinnerUserPodCustomIconId[] = "spinner";
+
+// Given the user pod icon, returns its id as used by the user pod UI code.
+std::string GetIdForIcon(ScreenlockBridge::UserPodCustomIcon icon) {
+  switch (icon) {
+    case ScreenlockBridge::USER_POD_CUSTOM_ICON_LOCKED:
+      return kLockedUserPodCustomIconId;
+    case ScreenlockBridge::USER_POD_CUSTOM_ICON_LOCKED_TO_BE_ACTIVATED:
+      return kLockedToBeActivatedUserPodCustomIconId;
+    case ScreenlockBridge::USER_POD_CUSTOM_ICON_LOCKED_WITH_PROXIMITY_HINT:
+      return kLockedWithProximityHintUserPodCustomIconId;
+    case ScreenlockBridge::USER_POD_CUSTOM_ICON_UNLOCKED:
+      return kUnlockedUserPodCustomIconId;
+    case ScreenlockBridge::USER_POD_CUSTOM_ICON_HARDLOCKED:
+      return kHardlockedUserPodCustomIconId;
+    case ScreenlockBridge::USER_POD_CUSTOM_ICON_SPINNER:
+      return kSpinnerUserPodCustomIconId;
+    default:
+      return "";
+  }
+}
+
 }  // namespace
 
 // static
@@ -28,13 +59,7 @@ ScreenlockBridge* ScreenlockBridge::Get() {
 }
 
 ScreenlockBridge::UserPodCustomIconOptions::UserPodCustomIconOptions()
-    : width_(0u),
-      height_(0u),
-      animation_set_(false),
-      animation_resource_width_(0u),
-      animation_frame_length_ms_(0u),
-      opacity_(100u),
-      autoshow_tooltip_(false),
+    : autoshow_tooltip_(false),
       hardlock_on_click_(false) {
 }
 
@@ -43,10 +68,8 @@ ScreenlockBridge::UserPodCustomIconOptions::~UserPodCustomIconOptions() {}
 scoped_ptr<base::DictionaryValue>
 ScreenlockBridge::UserPodCustomIconOptions::ToDictionaryValue() const {
   scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
-  if (icon_resource_url_.empty())
-    return result.Pass();
-
-  result->SetString("resourceUrl", icon_resource_url_);
+  std::string icon_id = GetIdForIcon(icon_);
+  result->SetString("id", icon_id);
 
   if (!tooltip_.empty()) {
     base::DictionaryValue* tooltip_options = new base::DictionaryValue();
@@ -55,21 +78,8 @@ ScreenlockBridge::UserPodCustomIconOptions::ToDictionaryValue() const {
     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);
-  }
+  if (!aria_label_.empty())
+    result->SetString("ariaLabel", aria_label_);
 
   if (hardlock_on_click_)
     result->SetBoolean("hardlockOnClick", true);
@@ -77,29 +87,9 @@ ScreenlockBridge::UserPodCustomIconOptions::ToDictionaryValue() const {
   return result.Pass();
 }
 
-void ScreenlockBridge::UserPodCustomIconOptions::SetIconAsResourceURL(
-    const std::string& url) {
-  icon_resource_url_ = url;
-}
-
-
-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::SetIcon(
+    ScreenlockBridge::UserPodCustomIcon icon) {
+  icon_ = icon;
 }
 
 void ScreenlockBridge::UserPodCustomIconOptions::SetTooltip(
@@ -109,6 +99,11 @@ void ScreenlockBridge::UserPodCustomIconOptions::SetTooltip(
   autoshow_tooltip_ = autoshow;
 }
 
+void ScreenlockBridge::UserPodCustomIconOptions::SetAriaLabel(
+    const base::string16& aria_label) {
+  aria_label_ = aria_label;
+}
+
 void ScreenlockBridge::UserPodCustomIconOptions::SetHardlockOnClick() {
   hardlock_on_click_ = true;
 }