| 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 16 matching lines...) Expand all Loading... |
| 27 #include "chrome/browser/ui/app_list/app_list_view_delegate.h" | 27 #include "chrome/browser/ui/app_list/app_list_view_delegate.h" |
| 28 #include "chrome/browser/ui/browser_commands.h" | 28 #include "chrome/browser/ui/browser_commands.h" |
| 29 #include "chrome/browser/ui/extensions/application_launch.h" | 29 #include "chrome/browser/ui/extensions/application_launch.h" |
| 30 #include "chrome/browser/web_applications/web_app.h" | 30 #include "chrome/browser/web_applications/web_app.h" |
| 31 #include "chrome/browser/web_applications/web_app_mac.h" | 31 #include "chrome/browser/web_applications/web_app_mac.h" |
| 32 #include "chrome/common/chrome_switches.h" | 32 #include "chrome/common/chrome_switches.h" |
| 33 #include "chrome/common/chrome_version_info.h" | 33 #include "chrome/common/chrome_version_info.h" |
| 34 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" | 34 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" |
| 35 #include "chrome/common/mac/app_mode_common.h" | 35 #include "chrome/common/mac/app_mode_common.h" |
| 36 #include "chrome/common/pref_names.h" | 36 #include "chrome/common/pref_names.h" |
| 37 #include "chrome/grit/google_chrome_strings.h" |
| 37 #include "content/public/browser/browser_thread.h" | 38 #include "content/public/browser/browser_thread.h" |
| 38 #include "extensions/browser/extension_system.h" | 39 #include "extensions/browser/extension_system.h" |
| 39 #include "extensions/common/manifest_handlers/file_handler_info.h" | 40 #include "extensions/common/manifest_handlers/file_handler_info.h" |
| 40 #include "grit/chrome_unscaled_resources.h" | 41 #include "grit/chrome_unscaled_resources.h" |
| 41 #include "grit/google_chrome_strings.h" | |
| 42 #include "net/base/url_util.h" | 42 #include "net/base/url_util.h" |
| 43 #import "ui/app_list/cocoa/app_list_view_controller.h" | 43 #import "ui/app_list/cocoa/app_list_view_controller.h" |
| 44 #import "ui/app_list/cocoa/app_list_window_controller.h" | 44 #import "ui/app_list/cocoa/app_list_window_controller.h" |
| 45 #include "ui/app_list/search_box_model.h" | 45 #include "ui/app_list/search_box_model.h" |
| 46 #include "ui/base/l10n/l10n_util.h" | 46 #include "ui/base/l10n/l10n_util.h" |
| 47 #include "ui/base/resource/resource_bundle.h" | 47 #include "ui/base/resource/resource_bundle.h" |
| 48 #include "ui/gfx/display.h" | 48 #include "ui/gfx/display.h" |
| 49 #include "ui/gfx/screen.h" | 49 #include "ui/gfx/screen.h" |
| 50 | 50 |
| 51 namespace gfx { | 51 namespace gfx { |
| (...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 593 | 593 |
| 594 - (void)animationDidEnd:(NSAnimation*)animation { | 594 - (void)animationDidEnd:(NSAnimation*)animation { |
| 595 content::BrowserThread::PostTask( | 595 content::BrowserThread::PostTask( |
| 596 content::BrowserThread::UI, | 596 content::BrowserThread::UI, |
| 597 FROM_HERE, | 597 FROM_HERE, |
| 598 base::Bind(&AppListServiceMac::WindowAnimationDidEnd, | 598 base::Bind(&AppListServiceMac::WindowAnimationDidEnd, |
| 599 base::Unretained(AppListServiceMac::GetInstance()))); | 599 base::Unretained(AppListServiceMac::GetInstance()))); |
| 600 } | 600 } |
| 601 | 601 |
| 602 @end | 602 @end |
| OLD | NEW |