Chromium Code Reviews| Index: chrome/browser/ui/app_list/app_list_service_mac.mm |
| diff --git a/chrome/browser/ui/app_list/app_list_service_mac.mm b/chrome/browser/ui/app_list/app_list_service_mac.mm |
| index 386b3b31a9248b159387eafb256eb0e9221b5970..a38f753f220f111e62cc0498ed87c8627c0ad925 100644 |
| --- a/chrome/browser/ui/app_list/app_list_service_mac.mm |
| +++ b/chrome/browser/ui/app_list/app_list_service_mac.mm |
| @@ -266,17 +266,6 @@ void GetAppListWindowOrigins( |
| start_origin); |
| } |
| -AppListServiceMac* GetActiveInstance() { |
| - if (app_list::switches::IsMacViewsAppListEnabled()) { |
| -#if defined(TOOLKIT_VIEWS) |
| - // TODO(tapted): Return AppListServiceViewsMac instance. |
| -#else |
| - NOTREACHED(); |
| -#endif |
| - } |
| - return AppListServiceCocoaMac::GetInstance(); |
| -} |
| - |
| } // namespace |
| AppListServiceMac::AppListServiceMac() { |
| @@ -512,13 +501,14 @@ void AppListServiceMac::WindowAnimationDidEnd() { |
| // static |
| AppListService* AppListService::Get() { |
| - return GetActiveInstance(); |
| + return AppListServiceCocoaMac::GetInstance(); |
| } |
| // static |
| void AppListService::InitAll(Profile* initial_profile, |
| const base::FilePath& profile_path) { |
| - GetActiveInstance()->InitWithProfilePath(initial_profile, profile_path); |
| + AppListServiceCocoaMac::GetInstance()->InitWithProfilePath(initial_profile, |
|
msw
2016/05/05 01:51:06
nit: just call Get()?
tapted
2016/05/05 02:53:42
Hehe - I tried that _ages_ ago, but this one has t
|
| + profile_path); |
| } |
| @implementation AppListAnimationController |
| @@ -583,10 +573,9 @@ void AppListService::InitAll(Profile* initial_profile, |
| - (void)animationDidEnd:(NSAnimation*)animation { |
| content::BrowserThread::PostTask( |
| - content::BrowserThread::UI, |
| - FROM_HERE, |
| + content::BrowserThread::UI, FROM_HERE, |
| base::Bind(&AppListServiceMac::WindowAnimationDidEnd, |
| - base::Unretained(GetActiveInstance()))); |
| + base::Unretained(AppListServiceCocoaMac::GetInstance()))); |
|
msw
2016/05/05 01:51:06
nit: just call AppListService::Get()?
tapted
2016/05/05 02:53:42
see above
|
| } |
| @end |