| 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 "apps/app_shim/app_shim_mac.h" | 10 #include "apps/app_shim/app_shim_mac.h" |
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 [animation_controller_ animateWindow:[window_controller_ window] | 435 [animation_controller_ animateWindow:[window_controller_ window] |
| 436 targetOrigin:last_start_origin_ | 436 targetOrigin:last_start_origin_ |
| 437 closing:YES]; | 437 closing:YES]; |
| 438 } | 438 } |
| 439 | 439 |
| 440 bool AppListServiceMac::IsAppListVisible() const { | 440 bool AppListServiceMac::IsAppListVisible() const { |
| 441 return [[window_controller_ window] isVisible] && | 441 return [[window_controller_ window] isVisible] && |
| 442 ![animation_controller_ isClosing]; | 442 ![animation_controller_ isClosing]; |
| 443 } | 443 } |
| 444 | 444 |
| 445 void AppListServiceMac::EnableAppList(Profile* initial_profile) { | 445 void AppListServiceMac::EnableAppList(Profile* initial_profile, |
| 446 AppListServiceImpl::EnableAppList(initial_profile); | 446 AppListEnableSource enable_source) { |
| 447 AppListServiceImpl::EnableAppList(initial_profile, enable_source); |
| 447 AppController* controller = [NSApp delegate]; | 448 AppController* controller = [NSApp delegate]; |
| 448 [controller initAppShimMenuController]; | 449 [controller initAppShimMenuController]; |
| 449 } | 450 } |
| 450 | 451 |
| 451 void AppListServiceMac::CreateShortcut() { | 452 void AppListServiceMac::CreateShortcut() { |
| 452 CreateAppListShim(GetProfilePath( | 453 CreateAppListShim(GetProfilePath( |
| 453 g_browser_process->profile_manager()->user_data_dir())); | 454 g_browser_process->profile_manager()->user_data_dir())); |
| 454 } | 455 } |
| 455 | 456 |
| 456 NSWindow* AppListServiceMac::GetAppListWindow() { | 457 NSWindow* AppListServiceMac::GetAppListWindow() { |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 594 | 595 |
| 595 - (void)animationDidEnd:(NSAnimation*)animation { | 596 - (void)animationDidEnd:(NSAnimation*)animation { |
| 596 content::BrowserThread::PostTask( | 597 content::BrowserThread::PostTask( |
| 597 content::BrowserThread::UI, | 598 content::BrowserThread::UI, |
| 598 FROM_HERE, | 599 FROM_HERE, |
| 599 base::Bind(&AppListServiceMac::WindowAnimationDidEnd, | 600 base::Bind(&AppListServiceMac::WindowAnimationDidEnd, |
| 600 base::Unretained(AppListServiceMac::GetInstance()))); | 601 base::Unretained(AppListServiceMac::GetInstance()))); |
| 601 } | 602 } |
| 602 | 603 |
| 603 @end | 604 @end |
| OLD | NEW |