content/shell/shell_browser_main_parts.h - Issue 15777006: Moar build fix for enable_plugins=0

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 15777006: Moar build fix for enable_plugins=0 (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 »

OLD	NEW
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 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
42	42

43 private:	43 private:

44 scoped_ptr<ShellBrowserContext> browser_context_;	44 scoped_ptr<ShellBrowserContext> browser_context_;

45 scoped_ptr<ShellBrowserContext> off_the_record_browser_context_;	45 scoped_ptr<ShellBrowserContext> off_the_record_browser_context_;

46	46

47 // For running content_browsertests.	47 // For running content_browsertests.

48 const MainFunctionParams& parameters_;	48 const MainFunctionParams& parameters_;

49 bool run_message_loop_;	49 bool run_message_loop_;

50	50

51 ShellDevToolsDelegate* devtools_delegate_;	51 ShellDevToolsDelegate* devtools_delegate_;

	52 #if defined(ENABLE_PLUGINS)

52 scoped_ptr<ShellPluginServiceFilter> plugin_service_filter_;	53 scoped_ptr<ShellPluginServiceFilter> plugin_service_filter_;

	54 #endif

53	55

54 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);	56 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);

55 };	57 };

56	58

57 } // namespace content	59 } // namespace content

58	60

59 #endif // CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_	61 #endif // CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_

OLD	NEW