content/shell/app/shell_main_delegate.cc - Issue 23316003: [content shell] move browser process stuff into browser/ subdir

Side by Side Diff: content/shell/app/shell_main_delegate.cc

Issue 23316003: [content shell] move browser process stuff into browser/ subdir (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 4 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 | « content/shell/android/shell_manager.cc ('k') | content/shell/browser/minimal_shell.h » ('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 #include "content/shell/app/shell_main_delegate.h"	5 #include "content/shell/app/shell_main_delegate.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/files/file_path.h"	8 #include "base/files/file_path.h"

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "base/path_service.h"	10 #include "base/path_service.h"

11 #include "cc/base/switches.h"	11 #include "cc/base/switches.h"

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

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

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

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

16 #include "content/shell/app/webkit_test_platform_support.h"	16 #include "content/shell/app/webkit_test_platform_support.h"

	17 #include "content/shell/browser/shell_browser_main.h"

	18 #include "content/shell/browser/shell_content_browser_client.h"

17 #include "content/shell/common/shell_switches.h"	19 #include "content/shell/common/shell_switches.h"

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

19 #include "content/shell/shell_browser_main.h"

20 #include "content/shell/shell_content_browser_client.h"

21 #include "net/cookies/cookie_monster.h"	21 #include "net/cookies/cookie_monster.h"

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

23 #include "ui/base/ui_base_paths.h"	23 #include "ui/base/ui_base_paths.h"

24 #include "ui/base/ui_base_switches.h"	24 #include "ui/base/ui_base_switches.h"

25 #include "ui/gl/gl_switches.h"	25 #include "ui/gl/gl_switches.h"

26	26

27 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED.	27 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED.

28	28

29 #if defined(IPC_MESSAGE_LOG_ENABLED)	29 #if defined(IPC_MESSAGE_LOG_ENABLED)

30 #define IPC_MESSAGE_MACROS_LOG_ENABLED	30 #define IPC_MESSAGE_MACROS_LOG_ENABLED

(...skipping 190 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
221 browser_client_.reset(new ShellContentBrowserClient);	221 browser_client_.reset(new ShellContentBrowserClient);

222 return browser_client_.get();	222 return browser_client_.get();

223 }	223 }

224	224

225 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {	225 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {

226 renderer_client_.reset(new ShellContentRendererClient);	226 renderer_client_.reset(new ShellContentRendererClient);

227 return renderer_client_.get();	227 return renderer_client_.get();

228 }	228 }

229	229

230 } // namespace content	230 } // namespace content

OLD	NEW