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

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

Issue 333353005: Move OmahaQueryParams to a component and add a delegate interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « apps/shell/browser/DEPS ('k') | apps/shell/browser/shell_browser_main_parts.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "content/public/common/main_function_params.h"
13 #include "ui/aura/window_tree_host_observer.h" 13 #include "ui/aura/window_tree_host_observer.h"
14 14
15 namespace content { 15 namespace content {
16 class ShellBrowserContext;
17 class ShellDevToolsDelegate; 16 class ShellDevToolsDelegate;
18 struct MainFunctionParams; 17 struct MainFunctionParams;
19 } 18 }
20 19
21 namespace extensions { 20 namespace extensions {
22 class ShellExtensionsBrowserClient; 21 class ShellExtensionsBrowserClient;
23 class ShellExtensionSystem; 22 class ShellExtensionSystem;
23 class ShellOmahaQueryParamsDelegate;
24 } 24 }
25 25
26 namespace views { 26 namespace views {
27 class Widget; 27 class Widget;
28 } 28 }
29 29
30 namespace net { 30 namespace net {
31 class NetLog; 31 class NetLog;
32 } 32 }
33 33
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 73
74 #if defined(OS_CHROMEOS) 74 #if defined(OS_CHROMEOS)
75 scoped_ptr<ShellNetworkController> network_controller_; 75 scoped_ptr<ShellNetworkController> network_controller_;
76 #endif 76 #endif
77 scoped_ptr<ShellDesktopController> desktop_controller_; 77 scoped_ptr<ShellDesktopController> desktop_controller_;
78 scoped_ptr<ShellBrowserContext> browser_context_; 78 scoped_ptr<ShellBrowserContext> browser_context_;
79 scoped_ptr<ShellExtensionsClient> extensions_client_; 79 scoped_ptr<ShellExtensionsClient> extensions_client_;
80 scoped_ptr<extensions::ShellExtensionsBrowserClient> 80 scoped_ptr<extensions::ShellExtensionsBrowserClient>
81 extensions_browser_client_; 81 extensions_browser_client_;
82 scoped_ptr<net::NetLog> net_log_; 82 scoped_ptr<net::NetLog> net_log_;
83
84 scoped_ptr<content::ShellDevToolsDelegate> devtools_delegate_; 83 scoped_ptr<content::ShellDevToolsDelegate> devtools_delegate_;
84 scoped_ptr<extensions::ShellOmahaQueryParamsDelegate>
85 omaha_query_params_delegate_;
85 86
86 // Owned by the KeyedService system. 87 // Owned by the KeyedService system.
87 extensions::ShellExtensionSystem* extension_system_; 88 extensions::ShellExtensionSystem* extension_system_;
88 89
89 // For running app browsertests. 90 // For running app browsertests.
90 const content::MainFunctionParams parameters_; 91 const content::MainFunctionParams parameters_;
91 92
92 // If true, indicates the main message loop should be run 93 // If true, indicates the main message loop should be run
93 // in MainMessageLoopRun. If false, it has already been run. 94 // in MainMessageLoopRun. If false, it has already been run.
94 bool run_message_loop_; 95 bool run_message_loop_;
95 96
96 scoped_ptr<ShellBrowserMainDelegate> browser_main_delegate_; 97 scoped_ptr<ShellBrowserMainDelegate> browser_main_delegate_;
97 98
98 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); 99 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
99 }; 100 };
100 101
101 } // namespace apps 102 } // namespace apps
102 103
103 #endif // APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ 104 #endif // APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
OLDNEW
« no previous file with comments | « apps/shell/browser/DEPS ('k') | apps/shell/browser/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698