OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ | 5 #ifndef APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ |
6 #define APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ | 6 #define APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 scoped_ptr<net::NetLog> net_log_; | 77 scoped_ptr<net::NetLog> net_log_; |
78 | 78 |
79 scoped_ptr<content::ShellDevToolsDelegate> devtools_delegate_; | 79 scoped_ptr<content::ShellDevToolsDelegate> devtools_delegate_; |
80 | 80 |
81 // Owned by the KeyedService system. | 81 // Owned by the KeyedService system. |
82 extensions::ShellExtensionSystem* extension_system_; | 82 extensions::ShellExtensionSystem* extension_system_; |
83 | 83 |
84 // For running app browsertests. | 84 // For running app browsertests. |
85 const content::MainFunctionParams parameters_; | 85 const content::MainFunctionParams parameters_; |
86 | 86 |
| 87 // If true, indicates the main message loop should be run |
| 88 // in MainMessageLoopRun. If false, it has already been run. |
| 89 bool run_message_loop_; |
| 90 |
87 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); | 91 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); |
88 }; | 92 }; |
89 | 93 |
90 } // namespace apps | 94 } // namespace apps |
91 | 95 |
92 #endif // APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ | 96 #endif // APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ |
OLD | NEW |