Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(229)

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

Issue 10868003: chromeos: Fix pixelated icons in app list and launcher (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win compile Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/launcher/launcher_model.h" 10 #include "ash/launcher/launcher_model.h"
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 UpdateAppLaunchersFromPref(); 619 UpdateAppLaunchersFromPref();
620 CheckAppSync(); 620 CheckAppSync();
621 break; 621 break;
622 } 622 }
623 case chrome::NOTIFICATION_EXTENSION_UNLOADED: { 623 case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
624 const content::Details<extensions::UnloadedExtensionInfo> unload_info( 624 const content::Details<extensions::UnloadedExtensionInfo> unload_info(
625 details); 625 details);
626 const Extension* extension = unload_info->extension; 626 const Extension* extension = unload_info->extension;
627 if (IsAppPinned(extension->id())) 627 if (IsAppPinned(extension->id()))
628 DoUnpinAppsWithID(extension->id()); 628 DoUnpinAppsWithID(extension->id());
629 app_icon_loader_->ClearImage(extension->id());
629 break; 630 break;
630 } 631 }
631 case chrome::NOTIFICATION_PREF_CHANGED: { 632 case chrome::NOTIFICATION_PREF_CHANGED: {
632 const std::string& pref_name( 633 const std::string& pref_name(
633 *content::Details<std::string>(details).ptr()); 634 *content::Details<std::string>(details).ptr());
634 if (pref_name == prefs::kPinnedLauncherApps) 635 if (pref_name == prefs::kPinnedLauncherApps)
635 UpdateAppLaunchersFromPref(); 636 UpdateAppLaunchersFromPref();
636 else if (pref_name == prefs::kShelfAlignment) 637 else if (pref_name == prefs::kShelfAlignment)
637 SetShelfAlignmentFromPrefs(); 638 SetShelfAlignmentFromPrefs();
638 else if (pref_name == prefs::kShelfAutoHideBehavior) 639 else if (pref_name == prefs::kShelfAutoHideBehavior)
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
937 } 938 }
938 939
939 void ChromeLauncherController::StopLoadingAnimation() { 940 void ChromeLauncherController::StopLoadingAnimation() {
940 DCHECK(observed_sync_service_); 941 DCHECK(observed_sync_service_);
941 942
942 model_->SetStatus(ash::LauncherModel::STATUS_NORMAL); 943 model_->SetStatus(ash::LauncherModel::STATUS_NORMAL);
943 loading_timer_.Stop(); 944 loading_timer_.Stop();
944 observed_sync_service_->RemoveObserver(this); 945 observed_sync_service_->RemoveObserver(this);
945 observed_sync_service_ = NULL; 946 observed_sync_service_ = NULL;
946 } 947 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.h ('k') | chrome/browser/ui/ash/launcher/launcher_app_icon_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698