| 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 // Called on the UI thread once the animation has completed to reset the | 72 // Called on the UI thread once the animation has completed to reset the |
| 73 // animation state, close the window (if it is a close animation), and possibly | 73 // animation state, close the window (if it is a close animation), and possibly |
| 74 // terminate Chrome. | 74 // terminate Chrome. |
| 75 - (void)cleanupOnUIThread; | 75 - (void)cleanupOnUIThread; |
| 76 | 76 |
| 77 @end | 77 @end |
| 78 | 78 |
| 79 namespace { | 79 namespace { |
| 80 | 80 |
| 81 // Version of the app list shortcut version installed. | 81 // Version of the app list shortcut version installed. |
| 82 const int kShortcutVersion = 1; | 82 const int kShortcutVersion = 2; |
| 83 | 83 |
| 84 // Duration of show and hide animations. | 84 // Duration of show and hide animations. |
| 85 const NSTimeInterval kAnimationDuration = 0.2; | 85 const NSTimeInterval kAnimationDuration = 0.2; |
| 86 | 86 |
| 87 // Distance towards the screen edge that the app list moves from when showing. | 87 // Distance towards the screen edge that the app list moves from when showing. |
| 88 const CGFloat kDistanceMovedOnShow = 20; | 88 const CGFloat kDistanceMovedOnShow = 20; |
| 89 | 89 |
| 90 web_app::ShortcutInfo GetAppListShortcutInfo( | 90 web_app::ShortcutInfo GetAppListShortcutInfo( |
| 91 const base::FilePath& profile_path) { | 91 const base::FilePath& profile_path) { |
| 92 web_app::ShortcutInfo shortcut_info; | 92 web_app::ShortcutInfo shortcut_info; |
| (...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 595 | 595 |
| 596 - (void)animationDidEnd:(NSAnimation*)animation { | 596 - (void)animationDidEnd:(NSAnimation*)animation { |
| 597 content::BrowserThread::PostTask( | 597 content::BrowserThread::PostTask( |
| 598 content::BrowserThread::UI, | 598 content::BrowserThread::UI, |
| 599 FROM_HERE, | 599 FROM_HERE, |
| 600 base::Bind(&AppListServiceMac::WindowAnimationDidEnd, | 600 base::Bind(&AppListServiceMac::WindowAnimationDidEnd, |
| 601 base::Unretained(AppListServiceMac::GetInstance()))); | 601 base::Unretained(AppListServiceMac::GetInstance()))); |
| 602 } | 602 } |
| 603 | 603 |
| 604 @end | 604 @end |
| OLD | NEW |