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

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

Issue 2911983003: Replace deprecated base::NonThreadSafe in chrome in favor of SequenceChecker. (Closed)
Patch Set: Created 3 years, 6 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_STARTUP_LOCK_H_ 5 #ifndef CHROME_BROWSER_PROCESS_SINGLETON_STARTUP_LOCK_H_
6 #define CHROME_BROWSER_PROCESS_SINGLETON_STARTUP_LOCK_H_ 6 #define CHROME_BROWSER_PROCESS_SINGLETON_STARTUP_LOCK_H_
7 7
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/threading/non_thread_safe.h" 15 #include "base/sequence_checker.h"
16 #include "chrome/browser/process_singleton.h" 16 #include "chrome/browser/process_singleton.h"
17 17
18 // Provides a ProcessSingleton::NotificationCallback that can queue up 18 // Provides a ProcessSingleton::NotificationCallback that can queue up
19 // command-line invocations during startup and execute them when startup 19 // command-line invocations during startup and execute them when startup
20 // completes. 20 // completes.
21 // 21 //
22 // The object starts in a locked state. |Unlock()| must be called 22 // The object starts in a locked state. |Unlock()| must be called
23 // when the process is prepared to handle command-line invocations. 23 // when the process is prepared to handle command-line invocations.
24 // 24 //
25 // Once unlocked, notifications are forwarded to a wrapped NotificationCallback. 25 // Once unlocked, notifications are forwarded to a wrapped NotificationCallback.
26 class ProcessSingletonStartupLock : public base::NonThreadSafe { 26 class ProcessSingletonStartupLock {
27 public: 27 public:
28 explicit ProcessSingletonStartupLock( 28 explicit ProcessSingletonStartupLock(
29 const ProcessSingleton::NotificationCallback& original_callback); 29 const ProcessSingleton::NotificationCallback& original_callback);
30 ~ProcessSingletonStartupLock(); 30 ~ProcessSingletonStartupLock();
31 31
32 // Returns the ProcessSingleton::NotificationCallback. 32 // Returns the ProcessSingleton::NotificationCallback.
33 // The callback is only valid during the lifetime of the 33 // The callback is only valid during the lifetime of the
34 // ProcessSingletonStartupLock instance. 34 // ProcessSingletonStartupLock instance.
35 ProcessSingleton::NotificationCallback AsNotificationCallback(); 35 ProcessSingleton::NotificationCallback AsNotificationCallback();
36 36
37 // Executes previously queued command-line invocations and allows future 37 // Executes previously queued command-line invocations and allows future
38 // invocations to be executed immediately. 38 // invocations to be executed immediately.
39 void Unlock(); 39 void Unlock();
40 40
41 bool locked() { return locked_; } 41 bool locked() { return locked_; }
42 42
43 private: 43 private:
44 typedef std::pair<base::CommandLine::StringVector, base::FilePath> 44 typedef std::pair<base::CommandLine::StringVector, base::FilePath>
45 DelayedStartupMessage; 45 DelayedStartupMessage;
46 46
47 bool NotificationCallbackImpl(const base::CommandLine& command_line, 47 bool NotificationCallbackImpl(const base::CommandLine& command_line,
48 const base::FilePath& current_directory); 48 const base::FilePath& current_directory);
49 49
50 bool locked_; 50 bool locked_;
51 std::vector<DelayedStartupMessage> saved_startup_messages_; 51 std::vector<DelayedStartupMessage> saved_startup_messages_;
52 ProcessSingleton::NotificationCallback original_callback_; 52 ProcessSingleton::NotificationCallback original_callback_;
53 53
54 SEQUENCE_CHECKER(sequence_checker_);
55
54 DISALLOW_COPY_AND_ASSIGN(ProcessSingletonStartupLock); 56 DISALLOW_COPY_AND_ASSIGN(ProcessSingletonStartupLock);
55 }; 57 };
56 58
57 #endif // CHROME_BROWSER_PROCESS_SINGLETON_STARTUP_LOCK_H_ 59 #endif // CHROME_BROWSER_PROCESS_SINGLETON_STARTUP_LOCK_H_
OLDNEW
« no previous file with comments | « chrome/browser/process_singleton_posix.cc ('k') | chrome/browser/process_singleton_startup_lock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698