content/shell/shell_main_delegate.cc - Issue 14767019: [content shell] move code common to several processes to a common dir

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/shell_main_delegate.cc

Issue 14767019: [content shell] move code common to several processes to a common dir (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:

Index: content/shell/shell_main_delegate.cc

diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc

index 69813218a7888be0379b3609aac345568b3897cb..c8c66897f37615d0a4390df577ee91835031764f 100644

--- a/content/shell/shell_main_delegate.cc

+++ b/content/shell/shell_main_delegate.cc

@@ -11,12 +11,12 @@

#include "content/public/browser/browser_main_runner.h"

#include "content/public/common/content_switches.h"

#include "content/public/common/url_constants.h"

+#include "content/public/test/layouttest_support.h"

+#include "content/shell/common/shell_switches.h"

#include "content/shell/renderer/shell_content_renderer_client.h"

#include "content/shell/shell_browser_main.h"

#include "content/shell/shell_content_browser_client.h"

-#include "content/shell/shell_switches.h"

#include "content/shell/webkit_test_platform_support.h"

-#include "content/public/test/layouttest_support.h"

#include "net/cookies/cookie_monster.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/ui_base_paths.h"

@@ -30,7 +30,7 @@

#include "content/public/common/content_ipc_logging.h"

#define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \

content::RegisterIPCLogger(msg_id, logger)

-#include "content/shell/shell_messages.h"

+#include "content/shell/common/shell_messages.h"

#endif

#if defined(OS_ANDROID)

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