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

Side by Side Diff: chrome/browser/shell_integration_linux.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
« no previous file with comments | « chrome/browser/shell_integration.cc ('k') | chrome/browser/shell_integration_linux_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/shell_integration_linux.h" 5 #include "chrome/browser/shell_integration_linux.h"
6 6
7 #include <fcntl.h> 7 #include <fcntl.h>
8 8
9 #if defined(USE_GLIB) 9 #if defined(USE_GLIB)
10 #include <glib.h> 10 #include <glib.h>
11 #endif 11 #endif
12 12
13 #include <stdlib.h> 13 #include <stdlib.h>
14 #include <sys/stat.h> 14 #include <sys/stat.h>
15 #include <sys/types.h> 15 #include <sys/types.h>
16 #include <unistd.h> 16 #include <unistd.h>
17 17
18 #include <string> 18 #include <string>
19 #include <vector> 19 #include <vector>
20 20
21 #include "base/base_paths.h" 21 #include "base/base_paths.h"
22 #include "base/command_line.h" 22 #include "base/command_line.h"
23 #include "base/environment.h" 23 #include "base/environment.h"
24 #include "base/file_util.h"
25 #include "base/files/file_enumerator.h" 24 #include "base/files/file_enumerator.h"
26 #include "base/files/file_path.h" 25 #include "base/files/file_path.h"
26 #include "base/files/file_util.h"
27 #include "base/files/scoped_temp_dir.h" 27 #include "base/files/scoped_temp_dir.h"
28 #include "base/i18n/file_util_icu.h" 28 #include "base/i18n/file_util_icu.h"
29 #include "base/memory/ref_counted_memory.h" 29 #include "base/memory/ref_counted_memory.h"
30 #include "base/memory/scoped_ptr.h" 30 #include "base/memory/scoped_ptr.h"
31 #include "base/message_loop/message_loop.h" 31 #include "base/message_loop/message_loop.h"
32 #include "base/path_service.h" 32 #include "base/path_service.h"
33 #include "base/posix/eintr_wrapper.h" 33 #include "base/posix/eintr_wrapper.h"
34 #include "base/process/kill.h" 34 #include "base/process/kill.h"
35 #include "base/process/launch.h" 35 #include "base/process/launch.h"
36 #include "base/strings/string_number_conversions.h" 36 #include "base/strings/string_number_conversions.h"
(...skipping 1037 matching lines...) Expand 10 before | Expand all | Expand 10 after
1074 for (std::vector<base::FilePath>::const_iterator it = 1074 for (std::vector<base::FilePath>::const_iterator it =
1075 shortcut_filenames_app_menu.begin(); 1075 shortcut_filenames_app_menu.begin();
1076 it != shortcut_filenames_app_menu.end(); ++it) { 1076 it != shortcut_filenames_app_menu.end(); ++it) {
1077 DeleteShortcutInApplicationsMenu(*it, 1077 DeleteShortcutInApplicationsMenu(*it,
1078 base::FilePath(kDirectoryFilename)); 1078 base::FilePath(kDirectoryFilename));
1079 } 1079 }
1080 } 1080 }
1081 } 1081 }
1082 1082
1083 } // namespace shell_integration_linux 1083 } // namespace shell_integration_linux
OLDNEW
« no previous file with comments | « chrome/browser/shell_integration.cc ('k') | chrome/browser/shell_integration_linux_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698