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

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

Issue 16059004: [content shell] only allow test plugins to load during layout tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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
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 11
12 namespace base { 12 namespace base {
13 class Thread; 13 class Thread;
14 } 14 }
15 15
16 namespace content { 16 namespace content {
17 17
18 class ShellBrowserContext; 18 class ShellBrowserContext;
19 class ShellDevToolsDelegate; 19 class ShellDevToolsDelegate;
20 class ShellPluginServiceFilter;
20 struct MainFunctionParams; 21 struct MainFunctionParams;
21 22
22 class ShellBrowserMainParts : public BrowserMainParts { 23 class ShellBrowserMainParts : public BrowserMainParts {
23 public: 24 public:
24 explicit ShellBrowserMainParts(const MainFunctionParams& parameters); 25 explicit ShellBrowserMainParts(const MainFunctionParams& parameters);
25 virtual ~ShellBrowserMainParts(); 26 virtual ~ShellBrowserMainParts();
26 27
27 // BrowserMainParts overrides. 28 // BrowserMainParts overrides.
28 virtual void PreEarlyInitialization() OVERRIDE; 29 virtual void PreEarlyInitialization() OVERRIDE;
29 virtual void PreMainMessageLoopStart() OVERRIDE; 30 virtual void PreMainMessageLoopStart() OVERRIDE;
(...skipping 11 matching lines...) Expand all
41 42
42 private: 43 private:
43 scoped_ptr<ShellBrowserContext> browser_context_; 44 scoped_ptr<ShellBrowserContext> browser_context_;
44 scoped_ptr<ShellBrowserContext> off_the_record_browser_context_; 45 scoped_ptr<ShellBrowserContext> off_the_record_browser_context_;
45 46
46 // For running content_browsertests. 47 // For running content_browsertests.
47 const MainFunctionParams& parameters_; 48 const MainFunctionParams& parameters_;
48 bool run_message_loop_; 49 bool run_message_loop_;
49 50
50 ShellDevToolsDelegate* devtools_delegate_; 51 ShellDevToolsDelegate* devtools_delegate_;
52 scoped_ptr<ShellPluginServiceFilter> plugin_service_filter_;
51 53
52 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); 54 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
53 }; 55 };
54 56
55 } // namespace content 57 } // namespace content
56 58
57 #endif // CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_ 59 #endif // CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698