summaryrefslogtreecommitdiffstats
path: root/chrome/browser/process_singleton.h
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-06-09 11:47:42 +0100
committerKristian Monsen <kristianm@google.com>2011-06-29 14:33:03 +0100
commitdc0f95d653279beabeb9817299e2902918ba123e (patch)
tree32eb121cd532053a5b9cb0c390331349af8d6baa /chrome/browser/process_singleton.h
parentba160cd4054d13d0cb0b1b46e61c3bed67095811 (diff)
downloadexternal_chromium-dc0f95d653279beabeb9817299e2902918ba123e.zip
external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.gz
external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.bz2
Merge Chromium at r11.0.696.0: Initial merge by git
Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
Diffstat (limited to 'chrome/browser/process_singleton.h')
-rw-r--r--chrome/browser/process_singleton.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
index 1aa80b2..7b92e00 100644
--- a/chrome/browser/process_singleton.h
+++ b/chrome/browser/process_singleton.h
@@ -78,6 +78,16 @@ class ProcessSingleton : public base::NonThreadSafe {
int timeout_seconds);
#endif // defined(OS_LINUX)
+#if defined(OS_WIN)
+ // Used in specific cases to let us know that there is an existing instance
+ // of Chrome running with this profile. In general, you should not use this
+ // function. Instead consider using NotifyOtherProcessOrCreate().
+ // For non profile-specific method, use Upgrade::IsBrowserAlreadyRunning().
+ bool FoundOtherProcessWindow() const {
+ return (NULL != remote_window_);
+ }
+#endif // defined(OS_WIN)
+
// Sets ourself up as the singleton instance. Returns true on success. If
// false is returned, we are not the singleton instance and the caller must
// exit.