Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: chrome/browser/mac/relauncher.cc

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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 #include "chrome/browser/mac/relauncher.h" 5 #include "chrome/browser/mac/relauncher.h"
6 6
7 #include <ApplicationServices/ApplicationServices.h> 7 #include <ApplicationServices/ApplicationServices.h>
8 #include <AvailabilityMacros.h> 8 #include <AvailabilityMacros.h>
9 #include <crt_externs.h> 9 #include <crt_externs.h>
10 #include <dlfcn.h> 10 #include <dlfcn.h>
11 #include <string.h> 11 #include <string.h>
12 #include <sys/event.h> 12 #include <sys/event.h>
13 #include <sys/time.h> 13 #include <sys/time.h>
14 #include <sys/types.h> 14 #include <sys/types.h>
15 #include <unistd.h> 15 #include <unistd.h>
16 16
17 #include <string> 17 #include <string>
18 #include <vector> 18 #include <vector>
19 19
20 #include "base/basictypes.h" 20 #include "base/basictypes.h"
21 #include "base/file_util.h" 21 #include "base/files/file_util.h"
22 #include "base/files/scoped_file.h" 22 #include "base/files/scoped_file.h"
23 #include "base/logging.h" 23 #include "base/logging.h"
24 #include "base/mac/mac_logging.h" 24 #include "base/mac/mac_logging.h"
25 #include "base/mac/mac_util.h" 25 #include "base/mac/mac_util.h"
26 #include "base/mac/scoped_cftyperef.h" 26 #include "base/mac/scoped_cftyperef.h"
27 #include "base/path_service.h" 27 #include "base/path_service.h"
28 #include "base/posix/eintr_wrapper.h" 28 #include "base/posix/eintr_wrapper.h"
29 #include "base/process/launch.h" 29 #include "base/process/launch.h"
30 #include "base/strings/stringprintf.h" 30 #include "base/strings/stringprintf.h"
31 #include "base/strings/sys_string_conversions.h" 31 #include "base/strings/sys_string_conversions.h"
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 if (!dmg_bsd_device_name.empty()) { 370 if (!dmg_bsd_device_name.empty()) {
371 EjectAndTrashDiskImage(dmg_bsd_device_name); 371 EjectAndTrashDiskImage(dmg_bsd_device_name);
372 } 372 }
373 373
374 return 0; 374 return 0;
375 } 375 }
376 376
377 } // namespace internal 377 } // namespace internal
378 378
379 } // namespace mac_relauncher 379 } // namespace mac_relauncher
OLDNEW
« no previous file with comments | « chrome/browser/mac/master_prefs.mm ('k') | chrome/browser/media/chrome_media_stream_infobar_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698