| OLD | NEW |
| 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 613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 624 UpdateAppLaunchersFromPref(); | 624 UpdateAppLaunchersFromPref(); |
| 625 CheckAppSync(); | 625 CheckAppSync(); |
| 626 break; | 626 break; |
| 627 } | 627 } |
| 628 case chrome::NOTIFICATION_EXTENSION_UNLOADED: { | 628 case chrome::NOTIFICATION_EXTENSION_UNLOADED: { |
| 629 const content::Details<extensions::UnloadedExtensionInfo> unload_info( | 629 const content::Details<extensions::UnloadedExtensionInfo> unload_info( |
| 630 details); | 630 details); |
| 631 const Extension* extension = unload_info->extension; | 631 const Extension* extension = unload_info->extension; |
| 632 if (IsAppPinned(extension->id())) | 632 if (IsAppPinned(extension->id())) |
| 633 DoUnpinAppsWithID(extension->id()); | 633 DoUnpinAppsWithID(extension->id()); |
| 634 app_icon_loader_->ClearImage(extension->id()); |
| 634 break; | 635 break; |
| 635 } | 636 } |
| 636 case chrome::NOTIFICATION_PREF_CHANGED: { | 637 case chrome::NOTIFICATION_PREF_CHANGED: { |
| 637 const std::string& pref_name( | 638 const std::string& pref_name( |
| 638 *content::Details<std::string>(details).ptr()); | 639 *content::Details<std::string>(details).ptr()); |
| 639 if (pref_name == prefs::kPinnedLauncherApps) | 640 if (pref_name == prefs::kPinnedLauncherApps) |
| 640 UpdateAppLaunchersFromPref(); | 641 UpdateAppLaunchersFromPref(); |
| 641 else if (pref_name == prefs::kShelfAlignment) | 642 else if (pref_name == prefs::kShelfAlignment) |
| 642 SetShelfAlignmentFromPrefs(); | 643 SetShelfAlignmentFromPrefs(); |
| 643 else if (pref_name == prefs::kShelfAutoHideBehavior) | 644 else if (pref_name == prefs::kShelfAutoHideBehavior) |
| (...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1007 } | 1008 } |
| 1008 | 1009 |
| 1009 void ChromeLauncherController::StopLoadingAnimation() { | 1010 void ChromeLauncherController::StopLoadingAnimation() { |
| 1010 DCHECK(observed_sync_service_); | 1011 DCHECK(observed_sync_service_); |
| 1011 | 1012 |
| 1012 model_->SetStatus(ash::LauncherModel::STATUS_NORMAL); | 1013 model_->SetStatus(ash::LauncherModel::STATUS_NORMAL); |
| 1013 loading_timer_.Stop(); | 1014 loading_timer_.Stop(); |
| 1014 observed_sync_service_->RemoveObserver(this); | 1015 observed_sync_service_->RemoveObserver(this); |
| 1015 observed_sync_service_ = NULL; | 1016 observed_sync_service_ = NULL; |
| 1016 } | 1017 } |
| OLD | NEW |