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

Side by Side Diff: chrome/browser/process_singleton.h

Issue 8174005: Get Chrome to build & link with USE_AURA on Windows again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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/chrome_browser_main_win.cc ('k') | chrome/browser/process_singleton_aura.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_PROCESS_SINGLETON_H_ 5 #ifndef CHROME_BROWSER_PROCESS_SINGLETON_H_
6 #define CHROME_BROWSER_PROCESS_SINGLETON_H_ 6 #define CHROME_BROWSER_PROCESS_SINGLETON_H_
7 #pragma once 7 #pragma once
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 10
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 // Exposed for testing. We use a timeout on Linux, and in tests we want 71 // Exposed for testing. We use a timeout on Linux, and in tests we want
72 // this timeout to be short. 72 // this timeout to be short.
73 NotifyResult NotifyOtherProcessWithTimeout(const CommandLine& command_line, 73 NotifyResult NotifyOtherProcessWithTimeout(const CommandLine& command_line,
74 int timeout_seconds, 74 int timeout_seconds,
75 bool kill_unresponsive); 75 bool kill_unresponsive);
76 NotifyResult NotifyOtherProcessWithTimeoutOrCreate( 76 NotifyResult NotifyOtherProcessWithTimeoutOrCreate(
77 const CommandLine& command_line, 77 const CommandLine& command_line,
78 int timeout_seconds); 78 int timeout_seconds);
79 #endif // defined(OS_LINUX) 79 #endif // defined(OS_LINUX)
80 80
81 #if defined(OS_WIN) 81 #if defined(OS_WIN) && !defined(USE_AURA)
82 // Used in specific cases to let us know that there is an existing instance 82 // Used in specific cases to let us know that there is an existing instance
83 // of Chrome running with this profile. In general, you should not use this 83 // of Chrome running with this profile. In general, you should not use this
84 // function. Instead consider using NotifyOtherProcessOrCreate(). 84 // function. Instead consider using NotifyOtherProcessOrCreate().
85 // For non profile-specific method, use 85 // For non profile-specific method, use
86 // browser_util::IsBrowserAlreadyRunning(). 86 // browser_util::IsBrowserAlreadyRunning().
87 bool FoundOtherProcessWindow() const { 87 bool FoundOtherProcessWindow() const {
88 return (NULL != remote_window_); 88 return (NULL != remote_window_);
89 } 89 }
90 #endif // defined(OS_WIN) 90 #endif // defined(OS_WIN)
91 91
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 // File descriptor associated with the lockfile, valid between 177 // File descriptor associated with the lockfile, valid between
178 // |Create()| and |Cleanup()|. Two instances cannot have a lock on 178 // |Create()| and |Cleanup()|. Two instances cannot have a lock on
179 // the same file at the same time. 179 // the same file at the same time.
180 int lock_fd_; 180 int lock_fd_;
181 #endif 181 #endif
182 182
183 DISALLOW_COPY_AND_ASSIGN(ProcessSingleton); 183 DISALLOW_COPY_AND_ASSIGN(ProcessSingleton);
184 }; 184 };
185 185
186 #endif // CHROME_BROWSER_PROCESS_SINGLETON_H_ 186 #endif // CHROME_BROWSER_PROCESS_SINGLETON_H_
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_win.cc ('k') | chrome/browser/process_singleton_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698