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

Unified Diff: chrome/browser/process_singleton_posix.cc

Issue 816403003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/process_singleton_posix.cc
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
index d46ea97124016024a90c753aaf71b6095e832c7f..05e149951d70cd723cffb792c089b064c6273145 100644
--- a/chrome/browser/process_singleton_posix.cc
+++ b/chrome/browser/process_singleton_posix.cc
@@ -622,7 +622,7 @@ void ProcessSingleton::LinuxWatcher::HandleMessage(
DCHECK(ui_message_loop_ == base::MessageLoop::current());
DCHECK(reader);
- if (parent_->notification_callback_.Run(CommandLine(argv),
+ if (parent_->notification_callback_.Run(base::CommandLine(argv),
base::FilePath(current_dir))) {
// Send back "ACK" message to prevent the client process from starting up.
reader->FinishWithACK(kACKToken, arraysize(kACKToken) - 1);
@@ -755,14 +755,12 @@ ProcessSingleton::~ProcessSingleton() {
ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
return NotifyOtherProcessWithTimeout(
- *CommandLine::ForCurrentProcess(),
- kRetryAttempts,
- base::TimeDelta::FromSeconds(kTimeoutInSeconds),
- true);
+ *base::CommandLine::ForCurrentProcess(), kRetryAttempts,
+ base::TimeDelta::FromSeconds(kTimeoutInSeconds), true);
}
ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
- const CommandLine& cmd_line,
+ const base::CommandLine& cmd_line,
int retry_attempts,
const base::TimeDelta& timeout,
bool kill_unresponsive) {
@@ -897,14 +895,13 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
return NotifyOtherProcessWithTimeoutOrCreate(
- *CommandLine::ForCurrentProcess(),
- kRetryAttempts,
+ *base::CommandLine::ForCurrentProcess(), kRetryAttempts,
base::TimeDelta::FromSeconds(kTimeoutInSeconds));
}
ProcessSingleton::NotifyResult
ProcessSingleton::NotifyOtherProcessWithTimeoutOrCreate(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
int retry_attempts,
const base::TimeDelta& timeout) {
NotifyResult result = NotifyOtherProcessWithTimeout(
« no previous file with comments | « chrome/browser/process_singleton_modal_dialog_lock.cc ('k') | chrome/browser/process_singleton_posix_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698