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

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

Issue 10820007: Move all the layout tests that ran under browser_tests to run under content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 years, 5 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"
(...skipping 17 matching lines...) Expand all
28 virtual void PreEarlyInitialization() OVERRIDE; 28 virtual void PreEarlyInitialization() OVERRIDE;
29 virtual void PreMainMessageLoopStart() OVERRIDE; 29 virtual void PreMainMessageLoopStart() OVERRIDE;
30 virtual void PostMainMessageLoopStart() OVERRIDE; 30 virtual void PostMainMessageLoopStart() OVERRIDE;
31 virtual void PreMainMessageLoopRun() OVERRIDE; 31 virtual void PreMainMessageLoopRun() OVERRIDE;
32 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; 32 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
33 virtual void PostMainMessageLoopRun() OVERRIDE; 33 virtual void PostMainMessageLoopRun() OVERRIDE;
34 34
35 ShellDevToolsDelegate* devtools_delegate() { return devtools_delegate_; } 35 ShellDevToolsDelegate* devtools_delegate() { return devtools_delegate_; }
36 36
37 ShellBrowserContext* browser_context() { return browser_context_.get(); } 37 ShellBrowserContext* browser_context() { return browser_context_.get(); }
38 ShellBrowserContext* off_the_record_browser_context() {
39 return off_the_record_browser_context_.get();
40 }
38 41
39 private: 42 private:
40 scoped_ptr<ShellBrowserContext> browser_context_; 43 scoped_ptr<ShellBrowserContext> browser_context_;
44 scoped_ptr<ShellBrowserContext> off_the_record_browser_context_;
41 45
42 // For running content_browsertests. 46 // For running content_browsertests.
43 const MainFunctionParams& parameters_; 47 const MainFunctionParams& parameters_;
44 bool run_message_loop_; 48 bool run_message_loop_;
45 49
46 ShellDevToolsDelegate* devtools_delegate_; 50 ShellDevToolsDelegate* devtools_delegate_;
47 51
48 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); 52 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
49 }; 53 };
50 54
51 } // namespace content 55 } // namespace content
52 56
53 #endif // CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_ 57 #endif // CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698