Add new views::LabelButton and LabelButtonBorder.

ui/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 "ui/app_list/app_list_item_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "ui/app_list/app_list_item_model.h"
@@ skipping 36 matching lines @@
     return *font;
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   gfx::Font title_font(rb.GetFont(ui::ResourceBundle::BaseFont).GetFontName(),
                        kTitleFontSize);
   title_font = title_font.DeriveFont(0, gfx::Font::BOLD);
   font = new gfx::Font(title_font);
   return *font;
 }
 
-// An image view that is not interactive.
-class StaticImageView : public views::ImageView {
- public:
-  StaticImageView() : ImageView() {
-  }
-
- private:
-  // views::View overrides:
-  virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE {
-    return false;
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(StaticImageView);
-};
-
 }  // namespace
 
 // static
 const char AppListItemView::kViewClassName[] = "ui/app_list/AppListItemView";
 
 AppListItemView::AppListItemView(AppsGridView* apps_grid_view,
                                  AppListItemModel* model)
     : CustomButton(apps_grid_view),
       model_(model),
       apps_grid_view_(apps_grid_view),
-      icon_(new StaticImageView),
+      icon_(new views::ImageView),
       title_(new views::Label) {
+  icon_->set_interactive(false);
+
   title_->SetBackgroundColor(0);
   title_->SetAutoColorReadabilityEnabled(false);
   title_->SetEnabledColor(kTitleColor);
   title_->SetFont(GetTitleFont());
 
   const gfx::ShadowValue kIconShadows[] = {
     gfx::ShadowValue(gfx::Point(0, 2), 2, SkColorSetARGB(0x24, 0, 0, 0)),
   };
   icon_shadows_.assign(kIconShadows, kIconShadows + arraysize(kIconShadows));
 
@@ skipping 154 matching lines @@
   apps_grid_view_->EndDrag(true);
 }
 
 bool AppListItemView::OnMouseDragged(const ui::MouseEvent& event) {
   CustomButton::OnMouseDragged(event);
   apps_grid_view_->UpdateDrag(this, event);
   return true;
 }
 
 }  // namespace app_list