| 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 #include <stddef.h> | 9 #include <stddef.h> |
| 10 | 10 |
| 11 #include <utility> | 11 #include <utility> |
| 12 | 12 |
| 13 #include "base/bind.h" | 13 #include "base/bind.h" |
| 14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
| 15 #include "base/files/file_util.h" | 15 #include "base/files/file_util.h" |
| 16 #include "base/lazy_instance.h" | 16 #include "base/lazy_instance.h" |
| 17 #import "base/mac/foundation_util.h" |
| 17 #include "base/memory/singleton.h" | 18 #include "base/memory/singleton.h" |
| 18 #include "base/message_loop/message_loop.h" | 19 #include "base/message_loop/message_loop.h" |
| 19 #import "chrome/browser/app_controller_mac.h" | 20 #import "chrome/browser/app_controller_mac.h" |
| 20 #include "chrome/browser/browser_process.h" | 21 #include "chrome/browser/browser_process.h" |
| 21 #include "chrome/browser/extensions/extension_service.h" | 22 #include "chrome/browser/extensions/extension_service.h" |
| 22 #include "chrome/browser/profiles/profile_attributes_entry.h" | 23 #include "chrome/browser/profiles/profile_attributes_entry.h" |
| 23 #include "chrome/browser/profiles/profile_attributes_storage.h" | 24 #include "chrome/browser/profiles/profile_attributes_storage.h" |
| 24 #include "chrome/browser/profiles/profile_manager.h" | 25 #include "chrome/browser/profiles/profile_manager.h" |
| 25 #include "chrome/browser/ui/app_list/app_list_positioner.h" | 26 #include "chrome/browser/ui/app_list/app_list_positioner.h" |
| 26 #include "chrome/browser/ui/app_list/app_list_service.h" | 27 #include "chrome/browser/ui/app_list/app_list_service.h" |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 434 } | 435 } |
| 435 | 436 |
| 436 bool AppListServiceMac::IsAppListVisible() const { | 437 bool AppListServiceMac::IsAppListVisible() const { |
| 437 return [GetNativeWindow() isVisible] && | 438 return [GetNativeWindow() isVisible] && |
| 438 ![animation_controller_ isClosing]; | 439 ![animation_controller_ isClosing]; |
| 439 } | 440 } |
| 440 | 441 |
| 441 void AppListServiceMac::EnableAppList(Profile* initial_profile, | 442 void AppListServiceMac::EnableAppList(Profile* initial_profile, |
| 442 AppListEnableSource enable_source) { | 443 AppListEnableSource enable_source) { |
| 443 AppListServiceImpl::EnableAppList(initial_profile, enable_source); | 444 AppListServiceImpl::EnableAppList(initial_profile, enable_source); |
| 444 AppController* controller = [NSApp delegate]; | 445 AppController* controller = |
| 446 base::mac::ObjCCastStrict<AppController>([NSApp delegate]); |
| 445 [controller initAppShimMenuController]; | 447 [controller initAppShimMenuController]; |
| 446 } | 448 } |
| 447 | 449 |
| 448 void AppListServiceMac::CreateShortcut() { | 450 void AppListServiceMac::CreateShortcut() { |
| 449 CreateAppListShim(GetProfilePath( | 451 CreateAppListShim(GetProfilePath( |
| 450 g_browser_process->profile_manager()->user_data_dir())); | 452 g_browser_process->profile_manager()->user_data_dir())); |
| 451 } | 453 } |
| 452 | 454 |
| 453 NSWindow* AppListServiceMac::GetAppListWindow() { | 455 NSWindow* AppListServiceMac::GetAppListWindow() { |
| 454 return GetNativeWindow(); | 456 return GetNativeWindow(); |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 581 | 583 |
| 582 - (void)animationDidEnd:(NSAnimation*)animation { | 584 - (void)animationDidEnd:(NSAnimation*)animation { |
| 583 content::BrowserThread::PostTask( | 585 content::BrowserThread::PostTask( |
| 584 content::BrowserThread::UI, | 586 content::BrowserThread::UI, |
| 585 FROM_HERE, | 587 FROM_HERE, |
| 586 base::Bind(&AppListServiceMac::WindowAnimationDidEnd, | 588 base::Bind(&AppListServiceMac::WindowAnimationDidEnd, |
| 587 base::Unretained(GetActiveInstance()))); | 589 base::Unretained(GetActiveInstance()))); |
| 588 } | 590 } |
| 589 | 591 |
| 590 @end | 592 @end |
| OLD | NEW |