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

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

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 // On Linux, when the user tries to launch a second copy of chrome, we check 5 // On Linux, when the user tries to launch a second copy of chrome, we check
6 // for a socket in the user's profile directory. If the socket file is open we 6 // for a socket in the user's profile directory. If the socket file is open we
7 // send a message to the first chrome browser process with the current 7 // send a message to the first chrome browser process with the current
8 // directory and second process command line flags. The second process then 8 // directory and second process command line flags. The second process then
9 // exits. 9 // exits.
10 // 10 //
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 #include "base/strings/string_number_conversions.h" 69 #include "base/strings/string_number_conversions.h"
70 #include "base/strings/string_split.h" 70 #include "base/strings/string_split.h"
71 #include "base/strings/string_util.h" 71 #include "base/strings/string_util.h"
72 #include "base/strings/stringprintf.h" 72 #include "base/strings/stringprintf.h"
73 #include "base/strings/sys_string_conversions.h" 73 #include "base/strings/sys_string_conversions.h"
74 #include "base/strings/utf_string_conversions.h" 74 #include "base/strings/utf_string_conversions.h"
75 #include "base/threading/platform_thread.h" 75 #include "base/threading/platform_thread.h"
76 #include "base/time/time.h" 76 #include "base/time/time.h"
77 #include "base/timer/timer.h" 77 #include "base/timer/timer.h"
78 #include "chrome/common/chrome_constants.h" 78 #include "chrome/common/chrome_constants.h"
79 #include "chrome/grit/chromium_strings.h"
80 #include "chrome/grit/generated_resources.h"
79 #include "content/public/browser/browser_thread.h" 81 #include "content/public/browser/browser_thread.h"
80 #include "grit/chromium_strings.h"
81 #include "grit/generated_resources.h"
82 #include "net/base/net_util.h" 82 #include "net/base/net_util.h"
83 #include "ui/base/l10n/l10n_util.h" 83 #include "ui/base/l10n/l10n_util.h"
84 84
85 #if defined(OS_LINUX) 85 #if defined(OS_LINUX)
86 #include "chrome/browser/ui/process_singleton_dialog_linux.h" 86 #include "chrome/browser/ui/process_singleton_dialog_linux.h"
87 #endif 87 #endif
88 88
89 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS) 89 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
90 #include "ui/views/linux_ui/linux_ui.h" 90 #include "ui/views/linux_ui/linux_ui.h"
91 #endif 91 #endif
(...skipping 953 matching lines...) Expand 10 before | Expand all | Expand 10 after
1045 } 1045 }
1046 1046
1047 void ProcessSingleton::KillProcess(int pid) { 1047 void ProcessSingleton::KillProcess(int pid) {
1048 // TODO(james.su@gmail.com): Is SIGKILL ok? 1048 // TODO(james.su@gmail.com): Is SIGKILL ok?
1049 int rv = kill(static_cast<base::ProcessHandle>(pid), SIGKILL); 1049 int rv = kill(static_cast<base::ProcessHandle>(pid), SIGKILL);
1050 // ESRCH = No Such Process (can happen if the other process is already in 1050 // ESRCH = No Such Process (can happen if the other process is already in
1051 // progress of shutting down and finishes before we try to kill it). 1051 // progress of shutting down and finishes before we try to kill it).
1052 DCHECK(rv == 0 || errno == ESRCH) << "Error killing process: " 1052 DCHECK(rv == 0 || errno == ESRCH) << "Error killing process: "
1053 << safe_strerror(errno); 1053 << safe_strerror(errno);
1054 } 1054 }
OLDNEW
« no previous file with comments | « chrome/browser/printing/print_view_manager_base.cc ('k') | chrome/browser/process_singleton_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698