Remove old (dead) app list code.

ui/app_list/views/folder_header_view.cc

 // Copyright (c) 2013 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/views/folder_header_view.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 10 matching lines @@
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/painter.h"
 
 namespace app_list {
 
 namespace {
 
 const int kPreferredWidth = 360;
 const int kPreferredHeight = 48;
-const int kIconDimension = 24;
-const int kBackButtonPadding = 14;
-const int kBottomSeparatorPadding = 9;  // Non-experimental app list only.
 const int kBottomSeparatorHeight = 1;
 const int kMaxFolderNameWidth = 300;
 
 }  // namespace
 
 class FolderHeaderView::FolderNameView : public views::Textfield {
  public:
   FolderNameView() {
     SetBorder(views::Border::CreateEmptyBorder(1, 1, 1, 1));
     SetTextColor(kFolderTitleColor);
   }
 
   ~FolderNameView() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FolderNameView);
 };
 
 FolderHeaderView::FolderHeaderView(FolderHeaderViewDelegate* delegate)
     : folder_item_(nullptr),
-      back_button_(nullptr),
       folder_name_view_(new FolderNameView),
       folder_name_placeholder_text_(
           ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
               IDS_APP_LIST_FOLDER_NAME_PLACEHOLDER)),
       delegate_(delegate),
       folder_name_visible_(true) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  if (!app_list::switches::IsExperimentalAppListEnabled()) {
-    back_button_ = new views::ImageButton(this);
-    back_button_->SetImage(
-        views::ImageButton::STATE_NORMAL,
-        rb.GetImageSkiaNamed(IDR_APP_LIST_FOLDER_BACK_NORMAL));
-    back_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
-                                    views::ImageButton::ALIGN_MIDDLE);
-    AddChildView(back_button_);
-    back_button_->SetFocusForPlatform();
-    back_button_->set_request_focus_on_press(true);
-    back_button_->SetAccessibleName(
-        ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
-            IDS_APP_LIST_FOLDER_CLOSE_FOLDER_ACCESSIBILE_NAME));
-  }
-
   folder_name_view_->SetFontList(
       rb.GetFontList(ui::ResourceBundle::MediumFont));
   folder_name_view_->set_placeholder_text_color(kFolderTitleHintTextColor);
   folder_name_view_->set_placeholder_text(folder_name_placeholder_text_);
   folder_name_view_->SetBorder(views::Border::NullBorder());
   folder_name_view_->SetBackgroundColor(kContentsBackgroundColor);
   folder_name_view_->set_controller(this);
   AddChildView(folder_name_view_);
 }
 
@@ skipping 77 matching lines @@
 
 gfx::Size FolderHeaderView::GetPreferredSize() const {
   return gfx::Size(kPreferredWidth, kPreferredHeight);
 }
 
 void FolderHeaderView::Layout() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
-  if (!switches::IsExperimentalAppListEnabled()) {
-    gfx::Rect back_bounds;
-    DCHECK(back_button_);
-    back_bounds = rect;
-    back_bounds.set_width(kIconDimension + 2 * kBackButtonPadding);
-    back_button_->SetBoundsRect(back_bounds);
-  }
-
   gfx::Rect text_bounds(rect);
   base::string16 text = folder_item_ && !folder_item_->name().empty()
                             ? base::UTF8ToUTF16(folder_item_->name())
                             : folder_name_placeholder_text_;
   int text_width =
       gfx::Canvas::GetStringWidth(text, folder_name_view_->GetFontList()) +
       folder_name_view_->GetCaretBounds().width() +
       folder_name_view_->GetInsets().width();
   text_width = std::min(text_width, kMaxFolderNameWidth);
   text_bounds.set_x(rect.x() + (rect.width() - text_width) / 2);
@@ skipping 11 matching lines @@
 }
 
 void FolderHeaderView::OnPaint(gfx::Canvas* canvas) {
   views::View::OnPaint(canvas);
 
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty() || !folder_name_visible_)
     return;
 
   // Draw bottom separator line.
-  int horizontal_padding = app_list::switches::IsExperimentalAppListEnabled()
-                               ? kExperimentalAppsGridPadding
-                               : kBottomSeparatorPadding;
-  rect.Inset(horizontal_padding, 0);
+  rect.Inset(kAppsGridPadding, 0);
   rect.set_y(rect.bottom() - kBottomSeparatorHeight);
   rect.set_height(kBottomSeparatorHeight);
   canvas->FillRect(rect, kTopSeparatorColor);
 }
 
 void FolderHeaderView::ContentsChanged(views::Textfield* sender,
                                        const base::string16& new_contents) {
   // Temporarily remove from observer to ignore data change caused by us.
   if (!folder_item_)
     return;
@@ skipping 14 matching lines @@
 void FolderHeaderView::ButtonPressed(views::Button* sender,
                                      const ui::Event& event) {
   delegate_->NavigateBack(folder_item_, event);
 }
 
 void FolderHeaderView::ItemNameChanged() {
   Update();
 }
 
 }  // namespace app_list