content/shell/app/shell_main_delegate.h - Issue 1777503003: More strict restrictions for content -> content/shell dependencies.

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

Unified Diff: content/shell/app/shell_main_delegate.h

Issue 1777503003: More strict restrictions for content -> content/shell dependencies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed unnecessary namespace-qualification. Created 4 years, 9 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 side-by-side diff with in-line comments

Download patch

Index: content/shell/app/shell_main_delegate.h

diff --git a/content/shell/app/shell_main_delegate.h b/content/shell/app/shell_main_delegate.h

index 6b351e4ffce7e5bfd0f4061e671f01ec2095f6a6..59cf53c3ee88f9d931c993beaed03efcdffd7121 100644

--- a/content/shell/app/shell_main_delegate.h

+++ b/content/shell/app/shell_main_delegate.h

@@ -10,9 +10,9 @@

#include "base/memory/scoped_ptr.h"

#include "build/build_config.h"

#include "content/public/app/content_main_delegate.h"

-#include "content/shell/common/shell_content_client.h"

namespace content {

+class ContentClient;

class ShellContentBrowserClient;

class ShellContentRendererClient;

class ShellContentUtilityClient;

@@ -44,7 +44,7 @@ class ShellMainDelegate : public ContentMainDelegate {

scoped_ptr<ShellContentBrowserClient> browser_client_;

scoped_ptr<ShellContentRendererClient> renderer_client_;

scoped_ptr<ShellContentUtilityClient> utility_client_;

- ShellContentClient content_client_;

+ scoped_ptr<ContentClient> content_client_;

#if defined(OS_ANDROID)

scoped_ptr<BrowserMainRunner> browser_runner_;

« no previous file with comments | « content/shell/BUILD.gn ('k') | content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »