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

Side by Side 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/shell/shell_main_delegate.h ('k') | content/shell/shell_message_filter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "content/shell/shell_main_delegate.h" 5 #include "content/shell/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 "content/public/browser/browser_main_runner.h" 11 #include "content/public/browser/browser_main_runner.h"
12 #include "content/public/common/content_switches.h" 12 #include "content/public/common/content_switches.h"
13 #include "content/public/common/url_constants.h" 13 #include "content/public/common/url_constants.h"
14 #include "content/public/test/layouttest_support.h"
15 #include "content/shell/common/shell_switches.h"
14 #include "content/shell/renderer/shell_content_renderer_client.h" 16 #include "content/shell/renderer/shell_content_renderer_client.h"
15 #include "content/shell/shell_browser_main.h" 17 #include "content/shell/shell_browser_main.h"
16 #include "content/shell/shell_content_browser_client.h" 18 #include "content/shell/shell_content_browser_client.h"
17 #include "content/shell/shell_switches.h"
18 #include "content/shell/webkit_test_platform_support.h" 19 #include "content/shell/webkit_test_platform_support.h"
19 #include "content/public/test/layouttest_support.h"
20 #include "net/cookies/cookie_monster.h" 20 #include "net/cookies/cookie_monster.h"
21 #include "ui/base/resource/resource_bundle.h" 21 #include "ui/base/resource/resource_bundle.h"
22 #include "ui/base/ui_base_paths.h" 22 #include "ui/base/ui_base_paths.h"
23 #include "ui/base/ui_base_switches.h" 23 #include "ui/base/ui_base_switches.h"
24 #include "ui/gl/gl_switches.h" 24 #include "ui/gl/gl_switches.h"
25 25
26 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. 26 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED.
27 27
28 #if defined(IPC_MESSAGE_LOG_ENABLED) 28 #if defined(IPC_MESSAGE_LOG_ENABLED)
29 #define IPC_MESSAGE_MACROS_LOG_ENABLED 29 #define IPC_MESSAGE_MACROS_LOG_ENABLED
30 #include "content/public/common/content_ipc_logging.h" 30 #include "content/public/common/content_ipc_logging.h"
31 #define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \ 31 #define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \
32 content::RegisterIPCLogger(msg_id, logger) 32 content::RegisterIPCLogger(msg_id, logger)
33 #include "content/shell/shell_messages.h" 33 #include "content/shell/common/shell_messages.h"
34 #endif 34 #endif
35 35
36 #if defined(OS_ANDROID) 36 #if defined(OS_ANDROID)
37 #include "base/posix/global_descriptors.h" 37 #include "base/posix/global_descriptors.h"
38 #include "content/shell/android/shell_descriptors.h" 38 #include "content/shell/android/shell_descriptors.h"
39 #endif 39 #endif
40 40
41 #if defined(OS_MACOSX) 41 #if defined(OS_MACOSX)
42 #include "content/shell/paths_mac.h" 42 #include "content/shell/paths_mac.h"
43 #endif // OS_MACOSX 43 #endif // OS_MACOSX
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 browser_client_.reset(new ShellContentBrowserClient); 190 browser_client_.reset(new ShellContentBrowserClient);
191 return browser_client_.get(); 191 return browser_client_.get();
192 } 192 }
193 193
194 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 194 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
195 renderer_client_.reset(new ShellContentRendererClient); 195 renderer_client_.reset(new ShellContentRendererClient);
196 return renderer_client_.get(); 196 return renderer_client_.get();
197 } 197 }
198 198
199 } // namespace content 199 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_main_delegate.h ('k') | content/shell/shell_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698