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

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

Issue 16360007: [content shell] don't leak the devtools delegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | « no previous file | content/shell/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 (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"
(...skipping 15 matching lines...) Expand all
26 virtual ~ShellBrowserMainParts(); 26 virtual ~ShellBrowserMainParts();
27 27
28 // BrowserMainParts overrides. 28 // BrowserMainParts overrides.
29 virtual void PreEarlyInitialization() OVERRIDE; 29 virtual void PreEarlyInitialization() OVERRIDE;
30 virtual void PreMainMessageLoopStart() OVERRIDE; 30 virtual void PreMainMessageLoopStart() OVERRIDE;
31 virtual void PostMainMessageLoopStart() OVERRIDE; 31 virtual void PostMainMessageLoopStart() OVERRIDE;
32 virtual void PreMainMessageLoopRun() OVERRIDE; 32 virtual void PreMainMessageLoopRun() OVERRIDE;
33 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; 33 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
34 virtual void PostMainMessageLoopRun() OVERRIDE; 34 virtual void PostMainMessageLoopRun() OVERRIDE;
35 35
36 ShellDevToolsDelegate* devtools_delegate() { return devtools_delegate_; } 36 ShellDevToolsDelegate* devtools_delegate() {
37 return devtools_delegate_.get();
38 }
37 39
38 ShellBrowserContext* browser_context() { return browser_context_.get(); } 40 ShellBrowserContext* browser_context() { return browser_context_.get(); }
39 ShellBrowserContext* off_the_record_browser_context() { 41 ShellBrowserContext* off_the_record_browser_context() {
40 return off_the_record_browser_context_.get(); 42 return off_the_record_browser_context_.get();
41 } 43 }
42 44
43 private: 45 private:
44 scoped_ptr<ShellBrowserContext> browser_context_; 46 scoped_ptr<ShellBrowserContext> browser_context_;
45 scoped_ptr<ShellBrowserContext> off_the_record_browser_context_; 47 scoped_ptr<ShellBrowserContext> off_the_record_browser_context_;
46 48
47 // For running content_browsertests. 49 // For running content_browsertests.
48 const MainFunctionParams& parameters_; 50 const MainFunctionParams& parameters_;
49 bool run_message_loop_; 51 bool run_message_loop_;
50 52
51 ShellDevToolsDelegate* devtools_delegate_; 53 scoped_ptr<ShellDevToolsDelegate> devtools_delegate_;
52 #if defined(ENABLE_PLUGINS) 54 #if defined(ENABLE_PLUGINS)
53 scoped_ptr<ShellPluginServiceFilter> plugin_service_filter_; 55 scoped_ptr<ShellPluginServiceFilter> plugin_service_filter_;
54 #endif 56 #endif
55 57
56 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); 58 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
57 }; 59 };
58 60
59 } // namespace content 61 } // namespace content
60 62
61 #endif // CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_ 63 #endif // CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_
OLDNEW
« no previous file with comments | « no previous file | content/shell/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698