| Index: content/browser/browser_main_loop.h
|
| diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
|
| index 0abe7e158f1dcd0fa7b533e4ba29af36d30bc5f6..20fb58dbd21fe6b96081d1aa5c067f8f1d26c961 100644
|
| --- a/content/browser/browser_main_loop.h
|
| +++ b/content/browser/browser_main_loop.h
|
| @@ -6,8 +6,6 @@
|
| #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
|
| #pragma once
|
|
|
| -#include <vector>
|
| -
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
|
|
| @@ -55,11 +53,6 @@ class BrowserMainLoop {
|
| const CommandLine& parsed_command_line_;
|
| int result_code_;
|
|
|
| - // Vector of BrowserMainParts set by CreateBrowserMainParts ------------------
|
| - // The BrowserParts fucntions for each part are called in the order added.
|
| - // They are released (destroyed) in the reverse order.
|
| - std::vector<BrowserMainParts*> parts_list_;
|
| -
|
| // Members initialized in |MainMessageLoopStart()| ---------------------------
|
| scoped_ptr<MessageLoop> main_message_loop_;
|
| scoped_ptr<base::SystemMonitor> system_monitor_;
|
| @@ -70,6 +63,10 @@ class BrowserMainLoop {
|
| #endif
|
| scoped_ptr<BrowserThreadImpl> main_thread_;
|
|
|
| + // Parts are created in BrowserMainLoop::Init() and released/destroyed in
|
| + // the destructor before anything else.
|
| + scoped_ptr<BrowserMainParts> parts_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
|
| };
|
|
|
|
|