chrome/browser/ui/app_list/app_list_service_mac.mm - Issue 212273002: Move UpdateShortcutInfoAndIconForApp from web_app_ui to web_app

Side by Side Diff: chrome/browser/ui/app_list/app_list_service_mac.mm

Issue 212273002: Move UpdateShortcutInfoAndIconForApp from web_app_ui to web_app (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix build on linux Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/apps/shortcut_manager.cc ('k') | chrome/browser/ui/app_list/app_list_view_delegate.cc » ('j') | no next file with comments »

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"

11 #include "base/bind.h"	11 #include "base/bind.h"

12 #include "base/command_line.h"	12 #include "base/command_line.h"

13 #include "base/file_util.h"	13 #include "base/file_util.h"

14 #include "base/lazy_instance.h"	14 #include "base/lazy_instance.h"

15 #include "base/mac/mac_util.h"	15 #include "base/mac/mac_util.h"

16 #include "base/memory/singleton.h"	16 #include "base/memory/singleton.h"

17 #include "base/message_loop/message_loop.h"	17 #include "base/message_loop/message_loop.h"

18 #import "chrome/browser/app_controller_mac.h"	18 #import "chrome/browser/app_controller_mac.h"

19 #include "chrome/browser/browser_process.h"	19 #include "chrome/browser/browser_process.h"

20 #include "chrome/browser/extensions/extension_service.h"	20 #include "chrome/browser/extensions/extension_service.h"

21 #include "chrome/browser/profiles/profile_manager.h"	21 #include "chrome/browser/profiles/profile_manager.h"

22 #include "chrome/browser/ui/app_list/app_list_controller_delegate_impl.h"	22 #include "chrome/browser/ui/app_list/app_list_controller_delegate_impl.h"

23 #include "chrome/browser/ui/app_list/app_list_positioner.h"	23 #include "chrome/browser/ui/app_list/app_list_positioner.h"

24 #include "chrome/browser/ui/app_list/app_list_service.h"	24 #include "chrome/browser/ui/app_list/app_list_service.h"

25 #include "chrome/browser/ui/app_list/app_list_service_impl.h"	25 #include "chrome/browser/ui/app_list/app_list_service_impl.h"

26 #include "chrome/browser/ui/app_list/app_list_util.h"	26 #include "chrome/browser/ui/app_list/app_list_util.h"

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/ui/web_applications/web_app_ui.h"

31 #include "chrome/browser/web_applications/web_app.h"	30 #include "chrome/browser/web_applications/web_app.h"

32 #include "chrome/browser/web_applications/web_app_mac.h"	31 #include "chrome/browser/web_applications/web_app_mac.h"

33 #include "chrome/common/chrome_switches.h"	32 #include "chrome/common/chrome_switches.h"

34 #include "chrome/common/chrome_version_info.h"	33 #include "chrome/common/chrome_version_info.h"

35 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"	34 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"

36 #include "chrome/common/mac/app_mode_common.h"	35 #include "chrome/common/mac/app_mode_common.h"

37 #include "chrome/common/pref_names.h"	36 #include "chrome/common/pref_names.h"

38 #include "content/public/browser/browser_thread.h"	37 #include "content/public/browser/browser_thread.h"

39 #include "extensions/browser/extension_system.h"	38 #include "extensions/browser/extension_system.h"

40 #include "grit/chrome_unscaled_resources.h"	39 #include "grit/chrome_unscaled_resources.h"

(...skipping 554 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
595	594

596 - (void)animationDidEnd:(NSAnimation*)animation {	595 - (void)animationDidEnd:(NSAnimation*)animation {

597 content::BrowserThread::PostTask(	596 content::BrowserThread::PostTask(

598 content::BrowserThread::UI,	597 content::BrowserThread::UI,

599 FROM_HERE,	598 FROM_HERE,

600 base::Bind(&AppListServiceMac::WindowAnimationDidEnd,	599 base::Bind(&AppListServiceMac::WindowAnimationDidEnd,

601 base::Unretained(AppListServiceMac::GetInstance())));	600 base::Unretained(AppListServiceMac::GetInstance())));

602 }	601 }

603	602

604 @end	603 @end

OLD	NEW