summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-11 03:38:10 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-11 03:38:10 +0000
commit6f6ccb054fe8379db03b078e1c38e2f3b6377390 (patch)
tree4550db7a2bda14af161fc465e59176152647fe95 /ash
parent65a0c611876c39a494a863b6c669eb7a3c005295 (diff)
downloadchromium_src-6f6ccb054fe8379db03b078e1c38e2f3b6377390.zip
chromium_src-6f6ccb054fe8379db03b078e1c38e2f3b6377390.tar.gz
chromium_src-6f6ccb054fe8379db03b078e1c38e2f3b6377390.tar.bz2
chromeos: Fix pixelated icons in app list and launcher (part 3)
- Use extensions::IconImage for HiDPI icons; - Fix IconImage use default icon for bundled component extension icon; - Fix ImageLoadingTracker does not properly resize bundled component extension icon; - Get rid of icon cache and work thread for shadow generation. We are using the exact icon size (smaller) and only generate shadow for visible ones. Thus, it is no longer needed. BUG=131738, 131739 TEST=Verify launcher and app list have crispy icons on HiDPI. Review URL: https://chromiumcodereview.appspot.com/10868003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/wm/app_list_controller.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc
index 468a97b..5ae14a9 100644
--- a/ash/wm/app_list_controller.cc
+++ b/ash/wm/app_list_controller.cc
@@ -12,7 +12,6 @@
#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"
@@ -87,7 +86,6 @@ AppListController::AppListController()
: pagination_model_(new app_list::PaginationModel),
is_visible_(false),
view_(NULL) {
- app_list::IconCache::CreateInstance();
Shell::GetInstance()->AddShellObserver(this);
}
@@ -97,7 +95,6 @@ AppListController::~AppListController() {
if (view_ && view_->GetWidget())
view_->GetWidget()->CloseNow();
- app_list::IconCache::DeleteInstance();
Shell::GetInstance()->RemoveShellObserver(this);
}
@@ -144,8 +141,6 @@ 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);
@@ -174,8 +169,6 @@ void AppListController::ResetView() {
widget->GetNativeView()->GetRootWindow()->RemoveRootWindowObserver(this);
widget->GetNativeView()->GetFocusManager()->RemoveObserver(this);
view_ = NULL;
-
- app_list::IconCache::GetInstance()->PurgeAllUnused();
}
void AppListController::ScheduleAnimation() {