Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ | 5 #ifndef CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ |
| 6 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ | 6 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
|
jam
2011/11/14 19:45:55
nit: not needed anymore
stevenjb
2011/11/14 23:31:10
Done.
| |
| 10 | 10 |
| 11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 | 13 |
| 14 class CommandLine; | 14 class CommandLine; |
| 15 class HighResolutionTimerManager; | 15 class HighResolutionTimerManager; |
| 16 class MessageLoop; | 16 class MessageLoop; |
| 17 | 17 |
| 18 namespace base { | 18 namespace base { |
| 19 class SystemMonitor; | 19 class SystemMonitor; |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 47 int GetResultCode() const { return result_code_; } | 47 int GetResultCode() const { return result_code_; } |
| 48 | 48 |
| 49 private: | 49 private: |
| 50 void InitializeMainThread(); | 50 void InitializeMainThread(); |
| 51 | 51 |
| 52 // Members initialized on construction --------------------------------------- | 52 // Members initialized on construction --------------------------------------- |
| 53 const content::MainFunctionParams& parameters_; | 53 const content::MainFunctionParams& parameters_; |
| 54 const CommandLine& parsed_command_line_; | 54 const CommandLine& parsed_command_line_; |
| 55 int result_code_; | 55 int result_code_; |
| 56 | 56 |
| 57 // Vector of BrowserMainParts set by CreateBrowserMainParts ------------------ | 57 BrowserMainParts* parts_; |
|
jam
2011/11/14 19:45:55
nit: scoped_ptr?
stevenjb
2011/11/14 23:31:10
Done.
| |
| 58 // The BrowserParts fucntions for each part are called in the order added. | |
| 59 // They are released (destroyed) in the reverse order. | |
| 60 std::vector<BrowserMainParts*> parts_list_; | |
| 61 | 58 |
| 62 // Members initialized in |MainMessageLoopStart()| --------------------------- | 59 // Members initialized in |MainMessageLoopStart()| --------------------------- |
| 63 scoped_ptr<MessageLoop> main_message_loop_; | 60 scoped_ptr<MessageLoop> main_message_loop_; |
| 64 scoped_ptr<base::SystemMonitor> system_monitor_; | 61 scoped_ptr<base::SystemMonitor> system_monitor_; |
| 65 scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_; | 62 scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_; |
| 66 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_; | 63 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_; |
| 67 scoped_ptr<BrowserThreadImpl> main_thread_; | 64 scoped_ptr<BrowserThreadImpl> main_thread_; |
| 68 | 65 |
| 69 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); | 66 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); |
| 70 }; | 67 }; |
| 71 | 68 |
| 72 } // namespace content | 69 } // namespace content |
| 73 | 70 |
| 74 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ | 71 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ |
| OLD | NEW |