| 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" | 17 #include "content/shell/browser/shell_browser_main.h" |
| 18 #include "content/shell/browser/shell_content_browser_client.h" | 18 #include "content/shell/browser/shell_content_browser_client.h" |
| 19 #include "content/shell/common/shell_switches.h" | 19 #include "content/shell/common/shell_switches.h" |
| 20 #include "content/shell/renderer/shell_content_renderer_client.h" | 20 #include "content/shell/renderer/shell_content_renderer_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/gfx/switches.h" |
| 25 #include "ui/gl/gl_switches.h" | 26 #include "ui/gl/gl_switches.h" |
| 26 | 27 |
| 27 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. | 28 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. |
| 28 | 29 |
| 29 #if defined(IPC_MESSAGE_LOG_ENABLED) | 30 #if defined(IPC_MESSAGE_LOG_ENABLED) |
| 30 #define IPC_MESSAGE_MACROS_LOG_ENABLED | 31 #define IPC_MESSAGE_MACROS_LOG_ENABLED |
| 31 #include "content/public/common/content_ipc_logging.h" | 32 #include "content/public/common/content_ipc_logging.h" |
| 32 #define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \ | 33 #define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \ |
| 33 content::RegisterIPCLogger(msg_id, logger) | 34 content::RegisterIPCLogger(msg_id, logger) |
| 34 #include "content/shell/common/shell_messages.h" | 35 #include "content/shell/common/shell_messages.h" |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 browser_client_.reset(new ShellContentBrowserClient); | 226 browser_client_.reset(new ShellContentBrowserClient); |
| 226 return browser_client_.get(); | 227 return browser_client_.get(); |
| 227 } | 228 } |
| 228 | 229 |
| 229 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { | 230 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { |
| 230 renderer_client_.reset(new ShellContentRendererClient); | 231 renderer_client_.reset(new ShellContentRendererClient); |
| 231 return renderer_client_.get(); | 232 return renderer_client_.get(); |
| 232 } | 233 } |
| 233 | 234 |
| 234 } // namespace content | 235 } // namespace content |
| OLD | NEW |