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 "apps/shell/common/start_callback.h" | |
8 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
9 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
10 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
11 #include "content/public/browser/browser_main_parts.h" | 12 #include "content/public/browser/browser_main_parts.h" |
12 #include "content/public/common/main_function_params.h" | 13 #include "content/public/common/main_function_params.h" |
13 #include "ui/aura/window_tree_host_observer.h" | 14 #include "ui/aura/window_tree_host_observer.h" |
14 | 15 |
15 namespace content { | 16 namespace content { |
16 class ShellBrowserContext; | 17 class ShellBrowserContext; |
17 class ShellDevToolsDelegate; | 18 class ShellDevToolsDelegate; |
(...skipping 20 matching lines...) Expand all Loading... | |
38 class ShellExtensionsClient; | 39 class ShellExtensionsClient; |
39 | 40 |
40 #if defined(OS_CHROMEOS) | 41 #if defined(OS_CHROMEOS) |
41 class ShellNetworkController; | 42 class ShellNetworkController; |
42 #endif | 43 #endif |
43 | 44 |
44 // Handles initialization of AppShell. | 45 // Handles initialization of AppShell. |
45 class ShellBrowserMainParts : public content::BrowserMainParts, | 46 class ShellBrowserMainParts : public content::BrowserMainParts, |
46 public aura::WindowTreeHostObserver { | 47 public aura::WindowTreeHostObserver { |
47 public: | 48 public: |
48 explicit ShellBrowserMainParts( | 49 ShellBrowserMainParts(const content::MainFunctionParams& parameters, |
49 const content::MainFunctionParams& parameters); | 50 StartCallback* start_callback); |
50 virtual ~ShellBrowserMainParts(); | 51 virtual ~ShellBrowserMainParts(); |
51 | 52 |
52 ShellBrowserContext* browser_context() { | 53 ShellBrowserContext* browser_context() { |
53 return browser_context_.get(); | 54 return browser_context_.get(); |
54 } | 55 } |
55 | 56 |
56 extensions::ShellExtensionSystem* extension_system() { | 57 extensions::ShellExtensionSystem* extension_system() { |
57 return extension_system_; | 58 return extension_system_; |
58 } | 59 } |
59 | 60 |
(...skipping 29 matching lines...) Expand all Loading... | |
89 // Owned by the KeyedService system. | 90 // Owned by the KeyedService system. |
90 extensions::ShellExtensionSystem* extension_system_; | 91 extensions::ShellExtensionSystem* extension_system_; |
91 | 92 |
92 // For running app browsertests. | 93 // For running app browsertests. |
93 const content::MainFunctionParams parameters_; | 94 const content::MainFunctionParams parameters_; |
94 | 95 |
95 // If true, indicates the main message loop should be run | 96 // If true, indicates the main message loop should be run |
96 // in MainMessageLoopRun. If false, it has already been run. | 97 // in MainMessageLoopRun. If false, it has already been run. |
97 bool run_message_loop_; | 98 bool run_message_loop_; |
98 | 99 |
100 StartCallback* start_callback_; // not owned | |
James Cook
2014/05/08 21:27:24
nit: "not owned" -> "Not owned."
oshima
2014/05/08 23:57:03
Done.
| |
101 | |
99 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); | 102 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); |
100 }; | 103 }; |
101 | 104 |
102 } // namespace apps | 105 } // namespace apps |
103 | 106 |
104 #endif // APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ | 107 #endif // APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ |
OLD | NEW |