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

Unified Diff: content/browser/browser_main_loop.h

Issue 8549027: Fix ProcessSingletonTest.StartupRaceCondition for win. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.h
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index d02d578595dd60ac5379801768b439a3f98e206c..7dac5006ae0f13b3be95586edb4fcf589dfb7123 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -53,6 +53,8 @@ class BrowserMainLoop {
const CommandLine& parsed_command_line_;
int result_code_;
+ scoped_ptr<BrowserMainParts> parts_;
+
// Members initialized in |MainMessageLoopStart()| ---------------------------
scoped_ptr<MessageLoop> main_message_loop_;
scoped_ptr<base::SystemMonitor> system_monitor_;
@@ -61,13 +63,6 @@ class BrowserMainLoop {
#if defined(OS_WIN)
scoped_ptr<SystemMessageWindowWin> system_message_window_;
#endif
-
- // Destroy parts_ before main_message_loop_ (required) and before other
- // classes constructed in content (but after main_thread_).
- scoped_ptr<BrowserMainParts> parts_;
-
- // Members initialized in |InitializeMainThread()| ---------------------------
- // This must get destroyed before other threads that are created in parts_.
scoped_ptr<BrowserThreadImpl> main_thread_;
DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698