chrome/browser/ui/app_list/app_list_service_mac.mm - Issue 298953002: Remove --disable-app-shims.

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 298953002: Remove --disable-app-shims. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Sync and rebase Created 6 years, 7 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

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"

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

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

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

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

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

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

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

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

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

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

(...skipping 574 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

« no previous file with comments | « chrome/browser/resources/ntp4/apps_page.js ('k') | chrome/browser/ui/webui/ntp/app_launcher_handler.cc » ('j') | no next file with comments »