| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #import "chrome/browser/ui/app_list/app_list_service_mac.h" | 5 #import "chrome/browser/ui/app_list/app_list_service_mac.h" |
| 6 | 6 |
| 7 #include <ApplicationServices/ApplicationServices.h> | 7 #include <ApplicationServices/ApplicationServices.h> |
| 8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 AppListServiceMac::FindAnchorPoint(window_size, | 253 AppListServiceMac::FindAnchorPoint(window_size, |
| 254 display, | 254 display, |
| 255 primary_display_height, | 255 primary_display_height, |
| 256 cursor_is_visible, | 256 cursor_is_visible, |
| 257 cursor, | 257 cursor, |
| 258 target_origin, | 258 target_origin, |
| 259 start_origin); | 259 start_origin); |
| 260 } | 260 } |
| 261 | 261 |
| 262 AppListServiceMac* GetActiveInstance() { | 262 AppListServiceMac* GetActiveInstance() { |
| 263 if (app_list::switches::IsMacViewsAppListListEnabled()) { | 263 if (app_list::switches::IsMacViewsAppListEnabled()) { |
| 264 #if defined(TOOLKIT_VIEWS) | 264 #if defined(TOOLKIT_VIEWS) |
| 265 // TODO(tapted): Return AppListServiceViewsMac instance. | 265 // TODO(tapted): Return AppListServiceViewsMac instance. |
| 266 #else | 266 #else |
| 267 NOTREACHED(); | 267 NOTREACHED(); |
| 268 #endif | 268 #endif |
| 269 } | 269 } |
| 270 return AppListServiceCocoaMac::GetInstance(); | 270 return AppListServiceCocoaMac::GetInstance(); |
| 271 } | 271 } |
| 272 | 272 |
| 273 } // namespace | 273 } // namespace |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 583 | 583 |
| 584 - (void)animationDidEnd:(NSAnimation*)animation { | 584 - (void)animationDidEnd:(NSAnimation*)animation { |
| 585 content::BrowserThread::PostTask( | 585 content::BrowserThread::PostTask( |
| 586 content::BrowserThread::UI, | 586 content::BrowserThread::UI, |
| 587 FROM_HERE, | 587 FROM_HERE, |
| 588 base::Bind(&AppListServiceMac::WindowAnimationDidEnd, | 588 base::Bind(&AppListServiceMac::WindowAnimationDidEnd, |
| 589 base::Unretained(GetActiveInstance()))); | 589 base::Unretained(GetActiveInstance()))); |
| 590 } | 590 } |
| 591 | 591 |
| 592 @end | 592 @end |
| OLD | NEW |