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

Side by Side Diff: chrome/browser/shell_integration_linux.cc

Issue 19631004: Update include paths in chrome/browser/ for base/process changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge ToT Created 7 years, 5 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 (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 #include <glib.h> 8 #include <glib.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 #include <sys/stat.h> 10 #include <sys/stat.h>
11 #include <sys/types.h> 11 #include <sys/types.h>
12 #include <unistd.h> 12 #include <unistd.h>
13 13
14 #include <string> 14 #include <string>
15 #include <vector> 15 #include <vector>
16 16
17 #include "base/base_paths.h" 17 #include "base/base_paths.h"
18 #include "base/command_line.h" 18 #include "base/command_line.h"
19 #include "base/environment.h" 19 #include "base/environment.h"
20 #include "base/file_util.h" 20 #include "base/file_util.h"
21 #include "base/files/file_path.h" 21 #include "base/files/file_path.h"
22 #include "base/files/scoped_temp_dir.h" 22 #include "base/files/scoped_temp_dir.h"
23 #include "base/i18n/file_util_icu.h" 23 #include "base/i18n/file_util_icu.h"
24 #include "base/memory/ref_counted_memory.h" 24 #include "base/memory/ref_counted_memory.h"
25 #include "base/memory/scoped_ptr.h" 25 #include "base/memory/scoped_ptr.h"
26 #include "base/message_loop/message_loop.h" 26 #include "base/message_loop/message_loop.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_util.h" 29 #include "base/process/kill.h"
30 #include "base/process/launch.h"
30 #include "base/strings/string_number_conversions.h" 31 #include "base/strings/string_number_conversions.h"
31 #include "base/strings/string_tokenizer.h" 32 #include "base/strings/string_tokenizer.h"
32 #include "base/strings/string_util.h" 33 #include "base/strings/string_util.h"
33 #include "base/strings/utf_string_conversions.h" 34 #include "base/strings/utf_string_conversions.h"
34 #include "base/threading/thread.h" 35 #include "base/threading/thread.h"
35 #include "base/threading/thread_restrictions.h" 36 #include "base/threading/thread_restrictions.h"
36 #include "build/build_config.h" 37 #include "build/build_config.h"
37 #include "chrome/browser/web_applications/web_app.h" 38 #include "chrome/browser/web_applications/web_app.h"
38 #include "chrome/common/chrome_constants.h" 39 #include "chrome/common/chrome_constants.h"
39 #include "content/public/browser/browser_thread.h" 40 #include "content/public/browser/browser_thread.h"
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
868 // Delete shortcuts from |kDirectoryFilename|. 869 // Delete shortcuts from |kDirectoryFilename|.
869 // Note that it is possible that shortcuts were not created in the Chrome Apps 870 // Note that it is possible that shortcuts were not created in the Chrome Apps
870 // directory (depending on the value of |applications_menu_subdir| when they 871 // directory (depending on the value of |applications_menu_subdir| when they
871 // were created). It doesn't matter: this will still delete the shortcut even 872 // were created). It doesn't matter: this will still delete the shortcut even
872 // if it isn't in the directory. 873 // if it isn't in the directory.
873 DeleteShortcutInApplicationsMenu(shortcut_filename, 874 DeleteShortcutInApplicationsMenu(shortcut_filename,
874 base::FilePath(kDirectoryFilename)); 875 base::FilePath(kDirectoryFilename));
875 } 876 }
876 877
877 } // namespace ShellIntegrationLinux 878 } // namespace ShellIntegrationLinux
OLDNEW
« no previous file with comments | « chrome/browser/sessions/session_restore_browsertest.cc ('k') | chrome/browser/storage_monitor/storage_monitor_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698