Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / app_list / views / app_list_item_view.cc

diff --git a/src/ui/app_list/views/app_list_item_view.cc b/src/ui/app_list/views/app_list_item_view.cc
index a696995..ba5f4ad 100644 (file)
--- a/src/ui/app_list/views/app_list_item_view.cc
+++ b/src/ui/app_list/views/app_list_item_view.cc
@@ -213,9 +213,9 @@ void AppListItemView::SetTitleSubpixelAA() {
     return;
 
   if (enable_aa) {
-    title_->SetBackgroundColor(app_list::kContentsBackgroundColor);
+    title_->SetBackgroundColor(app_list::kLabelBackgroundColor);
     title_->set_background(views::Background::CreateSolidBackground(
-        app_list::kContentsBackgroundColor));
+        app_list::kLabelBackgroundColor));
   } else {
     // In other cases, keep the background transparent to ensure correct
     // interactions with animations. This will temporarily disable subpixel AA.
@@ -274,15 +274,11 @@ void AppListItemView::SetItemName(const base::string16& display_name,
 
 void AppListItemView::SetItemIsHighlighted(bool is_highlighted) {
   is_highlighted_ = is_highlighted;
-  apps_grid_view_->EnsureViewVisible(this);
   SchedulePaint();
 }
 
 void AppListItemView::SetItemIsInstalling(bool is_installing) {
   is_installing_ = is_installing;
-  if (is_installing_)
-    apps_grid_view_->EnsureViewVisible(this);
-
   if (ui_state_ == UI_STATE_NORMAL) {
     title_->SetVisible(!is_installing);
     progress_bar_->SetVisible(is_installing);
@@ -390,9 +386,9 @@ void AppListItemView::StateChanged() {
   } else {
     if (!is_folder_ui_enabled)
       apps_grid_view_->ClearSelectedView(this);
-    is_highlighted_ = false;
+    SetItemIsHighlighted(false);
     if (item_weak_)
-      item_weak_->SetHighlighted(false);
+      item_weak_->set_highlighted(false);
     title_->SetEnabledColor(kGridTitleColor);
   }
   title_->Invalidate();
@@ -543,10 +539,6 @@ void AppListItemView::ItemNameChanged() {
               base::UTF8ToUTF16(item_weak_->name()));
 }
 
-void AppListItemView::ItemHighlightedChanged() {
-  SetItemIsHighlighted(item_weak_->highlighted());
-}
-
 void AppListItemView::ItemIsInstallingChanged() {
   SetItemIsInstalling(item_weak_->is_installing());
 }