| 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" |
| 11 #include "content/public/browser/browser_main_parts.h" | 11 #include "content/public/browser/browser_main_parts.h" |
| 12 #include "content/public/common/main_function_params.h" |
| 12 #include "ui/aura/window_tree_host_observer.h" | 13 #include "ui/aura/window_tree_host_observer.h" |
| 13 | 14 |
| 14 namespace aura { | 15 namespace aura { |
| 15 class TestScreen; | 16 class TestScreen; |
| 16 } | 17 } |
| 17 | 18 |
| 18 namespace content { | 19 namespace content { |
| 19 class ShellBrowserContext; | 20 class ShellBrowserContext; |
| 20 class ShellDevToolsDelegate; | 21 class ShellDevToolsDelegate; |
| 21 struct MainFunctionParams; | 22 struct MainFunctionParams; |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 | 99 |
| 99 scoped_ptr<aura::TestScreen> test_screen_; | 100 scoped_ptr<aura::TestScreen> test_screen_; |
| 100 | 101 |
| 101 scoped_ptr<views::Widget> webview_window_; | 102 scoped_ptr<views::Widget> webview_window_; |
| 102 | 103 |
| 103 scoped_ptr<content::ShellDevToolsDelegate> devtools_delegate_; | 104 scoped_ptr<content::ShellDevToolsDelegate> devtools_delegate_; |
| 104 | 105 |
| 105 // Owned by the KeyedService system. | 106 // Owned by the KeyedService system. |
| 106 extensions::ShellExtensionSystem* extension_system_; | 107 extensions::ShellExtensionSystem* extension_system_; |
| 107 | 108 |
| 109 // For running app browsertests. |
| 110 const content::MainFunctionParams parameters_; |
| 111 |
| 108 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); | 112 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); |
| 109 }; | 113 }; |
| 110 | 114 |
| 111 } // namespace apps | 115 } // namespace apps |
| 112 | 116 |
| 113 #endif // APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ | 117 #endif // APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ |
| OLD | NEW |