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

Side by Side Diff: content/shell/shell_browser_main_parts.h

Issue 19957002: Run the later parts of startup as UI thread tasks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Run the later parts of startup as UI thread tasks - Jam's nits Created 7 years, 4 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
« no previous file with comments | « content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_ 5 #ifndef CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_
6 #define CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_ 6 #define CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/public/browser/browser_main_parts.h" 10 #include "content/public/browser/browser_main_parts.h"
11 #include "content/public/common/main_function_params.h"
11 12
12 namespace base { 13 namespace base {
13 class Thread; 14 class Thread;
14 } 15 }
15 16
16 namespace net { 17 namespace net {
17 class NetLog; 18 class NetLog;
18 } 19 }
19 20
20 namespace content { 21 namespace content {
21 22
22 class ShellBrowserContext; 23 class ShellBrowserContext;
23 class ShellDevToolsDelegate; 24 class ShellDevToolsDelegate;
24 class ShellPluginServiceFilter; 25 class ShellPluginServiceFilter;
25 struct MainFunctionParams;
26 26
27 class ShellBrowserMainParts : public BrowserMainParts { 27 class ShellBrowserMainParts : public BrowserMainParts {
28 public: 28 public:
29 explicit ShellBrowserMainParts(const MainFunctionParams& parameters); 29 explicit ShellBrowserMainParts(const MainFunctionParams& parameters);
30 virtual ~ShellBrowserMainParts(); 30 virtual ~ShellBrowserMainParts();
31 31
32 // BrowserMainParts overrides. 32 // BrowserMainParts overrides.
33 virtual void PreEarlyInitialization() OVERRIDE; 33 virtual void PreEarlyInitialization() OVERRIDE;
34 virtual void PreMainMessageLoopStart() OVERRIDE; 34 virtual void PreMainMessageLoopStart() OVERRIDE;
35 virtual void PostMainMessageLoopStart() OVERRIDE; 35 virtual void PostMainMessageLoopStart() OVERRIDE;
(...skipping 11 matching lines...) Expand all
47 } 47 }
48 48
49 net::NetLog* net_log() { return net_log_.get(); } 49 net::NetLog* net_log() { return net_log_.get(); }
50 50
51 private: 51 private:
52 scoped_ptr<net::NetLog> net_log_; 52 scoped_ptr<net::NetLog> net_log_;
53 scoped_ptr<ShellBrowserContext> browser_context_; 53 scoped_ptr<ShellBrowserContext> browser_context_;
54 scoped_ptr<ShellBrowserContext> off_the_record_browser_context_; 54 scoped_ptr<ShellBrowserContext> off_the_record_browser_context_;
55 55
56 // For running content_browsertests. 56 // For running content_browsertests.
57 const MainFunctionParams& parameters_; 57 const MainFunctionParams parameters_;
58 bool run_message_loop_; 58 bool run_message_loop_;
59 59
60 scoped_ptr<ShellDevToolsDelegate> devtools_delegate_; 60 scoped_ptr<ShellDevToolsDelegate> devtools_delegate_;
61 #if defined(ENABLE_PLUGINS) 61 #if defined(ENABLE_PLUGINS)
62 scoped_ptr<ShellPluginServiceFilter> plugin_service_filter_; 62 scoped_ptr<ShellPluginServiceFilter> plugin_service_filter_;
63 #endif 63 #endif
64 64
65 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); 65 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
66 }; 66 };
67 67
68 } // namespace content 68 } // namespace content
69 69
70 #endif // CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_ 70 #endif // CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_
OLDNEW
« no previous file with comments | « content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698