| Index: chrome/browser/ui/app_list/app_list_service_mac.h
|
| diff --git a/chrome/browser/ui/app_list/app_list_service_mac.h b/chrome/browser/ui/app_list/app_list_service_mac.h
|
| index 24090c855f86b738d4366f2969f8f0f4dc56134a..39e822b561e7574504dc59f0ae1ae61934a0a3c4 100644
|
| --- a/chrome/browser/ui/app_list/app_list_service_mac.h
|
| +++ b/chrome/browser/ui/app_list/app_list_service_mac.h
|
| @@ -14,9 +14,9 @@
|
|
|
| class AppListControllerDelegateImpl;
|
|
|
| -@class AppListAnimationController;
|
| @class AppListWindowController;
|
| template <typename T> struct DefaultSingletonTraits;
|
| +@class WindowAnimationController;
|
|
|
| namespace gfx {
|
| class Display;
|
| @@ -53,7 +53,6 @@ class AppListServiceMac : public AppListServiceImpl,
|
| NSPoint* start_origin);
|
|
|
| void ShowWindowNearDock();
|
| - void WindowAnimationDidEnd();
|
| void InitWithProfilePath(Profile* initial_profile,
|
| const base::FilePath& profile_path);
|
|
|
| @@ -92,7 +91,7 @@ class AppListServiceMac : public AppListServiceImpl,
|
| AppListServiceMac();
|
|
|
| base::scoped_nsobject<AppListWindowController> window_controller_;
|
| - base::scoped_nsobject<AppListAnimationController> animation_controller_;
|
| + base::scoped_nsobject<WindowAnimationController> animation_controller_;
|
| base::scoped_nsobject<NSRunningApplication> previously_active_application_;
|
| NSPoint last_start_origin_;
|
| Profile* profile_;
|
|
|