chrome/browser/ui/app_list/app_list_service_mac.mm - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

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 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix bad merge Created 6 years, 3 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/translate/standalone_cld_data_harness.cc ('k') | chrome/browser/ui/app_list/search/history_data_store_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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"

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

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

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

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

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

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

17 #include "base/prefs/pref_service.h"	17 #include "base/prefs/pref_service.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"

(...skipping 581 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
604	604

605 - (void)animationDidEnd:(NSAnimation*)animation {	605 - (void)animationDidEnd:(NSAnimation*)animation {

606 content::BrowserThread::PostTask(	606 content::BrowserThread::PostTask(

607 content::BrowserThread::UI,	607 content::BrowserThread::UI,

608 FROM_HERE,	608 FROM_HERE,

609 base::Bind(&AppListServiceMac::WindowAnimationDidEnd,	609 base::Bind(&AppListServiceMac::WindowAnimationDidEnd,

610 base::Unretained(AppListServiceMac::GetInstance())));	610 base::Unretained(AppListServiceMac::GetInstance())));

611 }	611 }

612	612

613 @end	613 @end

OLD	NEW