chromeos: Fix pixelated icons in app list and launcher (part 3)

ash/wm/app_list_controller.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/wm/app_list_controller.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "ui/app_list/app_list_view.h"
-#include "ui/app_list/icon_cache.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/transform_util.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 54 matching lines @@
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListController, public:
 
 AppListController::AppListController()
     : pagination_model_(new app_list::PaginationModel),
       is_visible_(false),
       view_(NULL) {
-  app_list::IconCache::CreateInstance();
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 AppListController::~AppListController() {
   // Ensures app list view goes before the controller since pagination model
   // lives in the controller and app list view would access it on destruction.
   if (view_ && view_->GetWidget())
     view_->GetWidget()->CloseNow();
 
-  app_list::IconCache::DeleteInstance();
   Shell::GetInstance()->RemoveShellObserver(this);
 }
 
 void AppListController::SetVisible(bool visible) {
   if (visible == is_visible_)
     return;
 
   is_visible_ = visible;
 
   // App list needs to know the new shelf layout in order to calculate its
@@ skipping 25 matching lines @@
   return is_visible_ && view_ ? view_->GetWidget()->GetNativeWindow() : NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListController, private:
 
 void AppListController::SetView(app_list::AppListView* view) {
   DCHECK(view_ == NULL);
 
   if (is_visible_) {
-    app_list::IconCache::GetInstance()->MarkAllEntryUnused();
-
     view_ = view;
     views::Widget* widget = view_->GetWidget();
     widget->AddObserver(this);
     Shell::GetInstance()->AddEnvEventFilter(this);
     Shell::GetInstance()->launcher()->AddIconObserver(this);
     widget->GetNativeView()->GetRootWindow()->AddRootWindowObserver(this);
     widget->GetNativeView()->GetFocusManager()->AddObserver(this);
     widget->SetOpacity(0);
     ScheduleAnimation();
 
     view_->GetWidget()->Show();
   } else {
     view->GetWidget()->Close();
   }
 }
 
 void AppListController::ResetView() {
   if (!view_)
     return;
 
   views::Widget* widget = view_->GetWidget();
   widget->RemoveObserver(this);
   GetLayer(widget)->GetAnimator()->RemoveObserver(this);
   Shell::GetInstance()->RemoveEnvEventFilter(this);
   Shell::GetInstance()->launcher()->RemoveIconObserver(this);
   widget->GetNativeView()->GetRootWindow()->RemoveRootWindowObserver(this);
   widget->GetNativeView()->GetFocusManager()->RemoveObserver(this);
   view_ = NULL;
-
-  app_list::IconCache::GetInstance()->PurgeAllUnused();
 }
 
 void AppListController::ScheduleAnimation() {
   // Stop observing previous animation.
   StopObservingImplicitAnimations();
 
   ui::Layer* layer = GetLayer(view_->GetWidget());
   layer->GetAnimator()->StopAnimating();
 
   gfx::Rect target_bounds;
@@ skipping 119 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListController, LauncherIconObserver implementation:
 
 void AppListController::OnLauncherIconPositionsChanged() {
   UpdateBounds();
 }
 
 }  // namespace internal
 }  // namespace ash