ash: First pass of Applist v2.

ash/app_list/app_list_item_view.cc

 // Copyright (c) 2012 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 "ash/app_list/app_list_item_view.h"
 
+#include "ash/app_list/app_list.h"
 #include "ash/app_list/app_list_item_model.h"
 #include "ash/app_list/app_list_model_view.h"
 #include "ash/app_list/drop_shadow_label.h"
 #include "ash/app_list/icon_cache.h"
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "base/threading/worker_pool.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/shadow_value.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
 namespace ash {
 
 namespace {
 
 const int kTopBottomPadding = 10;
 const int kIconTitleSpacing = 10;
 
 const SkColor kTitleColor = SK_ColorWHITE;
+const SkColor kTitleColorV2 = SkColorSetARGB(0xFF, 0x88, 0x88, 0x88);
 
 // 0.33 black
 const SkColor kHoverAndPushedColor = SkColorSetARGB(0x55, 0x00, 0x00, 0x00);
 
 // 0.16 black
 const SkColor kSelectedColor = SkColorSetARGB(0x2A, 0x00, 0x00, 0x00);
 
 const SkColor kHighlightedColor = kHoverAndPushedColor;
 
 // FontSize/IconSize ratio = 24 / 128, which means we should get 24 font size
@@ skipping 132 matching lines @@
                                  AppListItemModel* model,
                                  views::ButtonListener* listener)
     : CustomButton(listener),
       model_(model),
       list_model_view_(list_model_view),
       icon_(new StaticImageView),
       title_(new DropShadowLabel),
       selected_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(apply_shadow_factory_(this)) {
   title_->SetBackgroundColor(0);
-  title_->SetEnabledColor(kTitleColor);
 
-  const gfx::ShadowValue kTitleShadows[] = {
-    gfx::ShadowValue(gfx::Point(0, 0), 1, SkColorSetARGB(0x66, 0, 0, 0)),
-    gfx::ShadowValue(gfx::Point(0, 0), 10, SkColorSetARGB(0x66, 0, 0, 0)),
-    gfx::ShadowValue(gfx::Point(0, 2), 2, SkColorSetARGB(0x66, 0, 0, 0)),
-    gfx::ShadowValue(gfx::Point(0, 2), 4, SkColorSetARGB(0x66, 0, 0, 0)),
-  };
-  title_->SetTextShadows(arraysize(kTitleShadows), kTitleShadows);
+  if (internal::AppList::UseAppListV2()) {
+    title_->SetEnabledColor(kTitleColorV2);
+  } else {
+    title_->SetEnabledColor(kTitleColor);
+    const gfx::ShadowValue kTitleShadows[] = {
+      gfx::ShadowValue(gfx::Point(0, 0), 1, SkColorSetARGB(0x66, 0, 0, 0)),
+      gfx::ShadowValue(gfx::Point(0, 0), 10, SkColorSetARGB(0x66, 0, 0, 0)),
+      gfx::ShadowValue(gfx::Point(0, 2), 2, SkColorSetARGB(0x66, 0, 0, 0)),
+      gfx::ShadowValue(gfx::Point(0, 2), 4, SkColorSetARGB(0x66, 0, 0, 0)),
+    };
+    title_->SetTextShadows(arraysize(kTitleShadows), kTitleShadows);
+  }
 
   AddChildView(icon_);
   AddChildView(title_);
 
   ItemIconChanged();
   ItemTitleChanged();
   model_->AddObserver(this);
 
   set_context_menu_controller(this);
   set_request_focus_on_press(false);
@@ skipping 181 matching lines @@
 void AppListItemView::StateChanged() {
   if (state() == BS_HOT || state() == BS_PUSHED) {
     list_model_view_->SetSelectedItem(this);
   } else {
     list_model_view_->ClearSelectedItem(this);
     model_->SetHighlighted(false);
   }
 }
 
 }  // namespace ash