Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Side by Side Diff: extensions/shell/browser/shell_browser_main_parts.h

Issue 547593002: Add ShellAppsClient, ShellAppDelegate, ShellNativeAppWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@apifeatures
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ 5 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
6 #define EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ 6 #define EXTENSIONS_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 10 matching lines...) Expand all
21 class Widget; 21 class Widget;
22 } 22 }
23 23
24 namespace net { 24 namespace net {
25 class NetLog; 25 class NetLog;
26 } 26 }
27 27
28 namespace extensions { 28 namespace extensions {
29 29
30 class DesktopController; 30 class DesktopController;
31 class ShellAppsClient;
31 class ShellBrowserContext; 32 class ShellBrowserContext;
32 class ShellBrowserMainDelegate; 33 class ShellBrowserMainDelegate;
33 class ShellDeviceClient; 34 class ShellDeviceClient;
34 class ShellExtensionsBrowserClient; 35 class ShellExtensionsBrowserClient;
35 class ShellExtensionsClient; 36 class ShellExtensionsClient;
36 class ShellExtensionSystem; 37 class ShellExtensionSystem;
37 class ShellOmahaQueryParamsDelegate; 38 class ShellOmahaQueryParamsDelegate;
38 39
39 #if defined(OS_CHROMEOS) 40 #if defined(OS_CHROMEOS)
40 class ShellAudioController; 41 class ShellAudioController;
(...skipping 25 matching lines...) Expand all
66 // Creates and initializes the ExtensionSystem. 67 // Creates and initializes the ExtensionSystem.
67 void CreateExtensionSystem(); 68 void CreateExtensionSystem();
68 69
69 #if defined(OS_CHROMEOS) 70 #if defined(OS_CHROMEOS)
70 scoped_ptr<ShellNetworkController> network_controller_; 71 scoped_ptr<ShellNetworkController> network_controller_;
71 scoped_ptr<ShellAudioController> audio_controller_; 72 scoped_ptr<ShellAudioController> audio_controller_;
72 #endif 73 #endif
73 scoped_ptr<DesktopController> desktop_controller_; 74 scoped_ptr<DesktopController> desktop_controller_;
74 scoped_ptr<ShellBrowserContext> browser_context_; 75 scoped_ptr<ShellBrowserContext> browser_context_;
75 scoped_ptr<ShellDeviceClient> device_client_; 76 scoped_ptr<ShellDeviceClient> device_client_;
77 scoped_ptr<ShellAppsClient> apps_client_;
76 scoped_ptr<ShellExtensionsClient> extensions_client_; 78 scoped_ptr<ShellExtensionsClient> extensions_client_;
77 scoped_ptr<ShellExtensionsBrowserClient> extensions_browser_client_; 79 scoped_ptr<ShellExtensionsBrowserClient> extensions_browser_client_;
78 scoped_ptr<net::NetLog> net_log_; 80 scoped_ptr<net::NetLog> net_log_;
79 scoped_ptr<content::ShellDevToolsDelegate> devtools_delegate_; 81 scoped_ptr<content::ShellDevToolsDelegate> devtools_delegate_;
80 scoped_ptr<ShellOmahaQueryParamsDelegate> omaha_query_params_delegate_; 82 scoped_ptr<ShellOmahaQueryParamsDelegate> omaha_query_params_delegate_;
81 83
82 // Owned by the KeyedService system. 84 // Owned by the KeyedService system.
83 ShellExtensionSystem* extension_system_; 85 ShellExtensionSystem* extension_system_;
84 86
85 // For running app browsertests. 87 // For running app browsertests.
86 const content::MainFunctionParams parameters_; 88 const content::MainFunctionParams parameters_;
87 89
88 // If true, indicates the main message loop should be run 90 // If true, indicates the main message loop should be run
89 // in MainMessageLoopRun. If false, it has already been run. 91 // in MainMessageLoopRun. If false, it has already been run.
90 bool run_message_loop_; 92 bool run_message_loop_;
91 93
92 scoped_ptr<ShellBrowserMainDelegate> browser_main_delegate_; 94 scoped_ptr<ShellBrowserMainDelegate> browser_main_delegate_;
93 95
94 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); 96 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
95 }; 97 };
96 98
97 } // namespace extensions 99 } // namespace extensions
98 100
99 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ 101 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698