Merge 261625 "Remove the red background color when user enters a..."

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 "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/app_list/app_list_constants.h"
@@ skipping 29 matching lines @@
     SetBorder(views::Border::CreateEmptyBorder(1, 1, 1, 1));
     const SkColor kFocusBorderColor = SkColorSetRGB(64, 128, 250);
     SetFocusPainter(views::Painter::CreateSolidFocusPainter(
           kFocusBorderColor,
           gfx::Insets(0, 0, 1, 1)));
   }
 
   virtual ~FolderNameView() {
   }
 
-  void Update() {
-    SetBackgroundColor(text().size() <= kMaxFolderNameChars
-                           ? kContentsBackgroundColor
-                           : SK_ColorRED);
-  }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(FolderNameView);
 };
 
 FolderHeaderView::FolderHeaderView(FolderHeaderViewDelegate* delegate)
     : folder_item_(NULL),
       back_button_(new views::ImageButton(this)),
       folder_name_view_(new FolderNameView),
       folder_name_placeholder_text_(
           ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
@@ skipping 47 matching lines @@
   folder_item_ = NULL;
 }
 
 void FolderHeaderView::Update() {
   if (!folder_item_)
     return;
 
   folder_name_view_->SetVisible(folder_name_visible_);
   if (folder_name_visible_) {
     folder_name_view_->SetText(base::UTF8ToUTF16(folder_item_->name()));
-    folder_name_view_->Update();
   }
 
   Layout();
 }
 
 gfx::Size FolderHeaderView::GetPreferredSize() {
   return gfx::Size(kPreferredWidth, kPreferredHeight);
 }
 
 void FolderHeaderView::Layout() {
@@ skipping 40 matching lines @@
   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;
 
-  folder_name_view_->Update();
   folder_item_->RemoveObserver(this);
   // Enforce the maximum folder name length in UI.
   std::string name = base::UTF16ToUTF8(
       folder_name_view_->text().substr(0, kMaxFolderNameChars));
   if (name != folder_item_->name())
     delegate_->SetItemName(folder_item_, name);
   folder_item_->AddObserver(this);
 
   Layout();
 }
@@ skipping 14 matching lines @@
 void FolderHeaderView::ItemHighlightedChanged() {
 }
 
 void FolderHeaderView::ItemIsInstallingChanged() {
 }
 
 void FolderHeaderView::ItemPercentDownloadedChanged() {
 }
 
 }  // namespace app_list