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/base_switches.h" | 7 #include "base/base_switches.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/cpu.h" | 9 #include "base/cpu.h" |
10 #include "base/files/file.h" | 10 #include "base/files/file.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 #include "content/shell/common/shell_switches.h" | 32 #include "content/shell/common/shell_switches.h" |
33 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client
.h" | 33 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client
.h" |
34 #include "content/shell/renderer/shell_content_renderer_client.h" | 34 #include "content/shell/renderer/shell_content_renderer_client.h" |
35 #include "content/shell/utility/shell_content_utility_client.h" | 35 #include "content/shell/utility/shell_content_utility_client.h" |
36 #include "media/base/media_switches.h" | 36 #include "media/base/media_switches.h" |
37 #include "media/base/mime_util.h" | 37 #include "media/base/mime_util.h" |
38 #include "net/cookies/cookie_monster.h" | 38 #include "net/cookies/cookie_monster.h" |
39 #include "ui/base/resource/resource_bundle.h" | 39 #include "ui/base/resource/resource_bundle.h" |
40 #include "ui/base/ui_base_paths.h" | 40 #include "ui/base/ui_base_paths.h" |
41 #include "ui/base/ui_base_switches.h" | 41 #include "ui/base/ui_base_switches.h" |
| 42 #include "ui/display/display_switches.h" |
42 #include "ui/events/event_switches.h" | 43 #include "ui/events/event_switches.h" |
43 #include "ui/gfx/switches.h" | |
44 #include "ui/gl/gl_switches.h" | 44 #include "ui/gl/gl_switches.h" |
45 | 45 |
46 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. | 46 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. |
47 | 47 |
48 #if defined(IPC_MESSAGE_LOG_ENABLED) | 48 #if defined(IPC_MESSAGE_LOG_ENABLED) |
49 #define IPC_MESSAGE_MACROS_LOG_ENABLED | 49 #define IPC_MESSAGE_MACROS_LOG_ENABLED |
50 #include "content/public/common/content_ipc_logging.h" | 50 #include "content/public/common/content_ipc_logging.h" |
51 #define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \ | 51 #define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \ |
52 content::RegisterIPCLogger(msg_id, logger) | 52 content::RegisterIPCLogger(msg_id, logger) |
53 #include "content/shell/common/shell_messages.h" | 53 #include "content/shell/common/shell_messages.h" |
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 | 366 |
367 return renderer_client_.get(); | 367 return renderer_client_.get(); |
368 } | 368 } |
369 | 369 |
370 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { | 370 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { |
371 utility_client_.reset(new ShellContentUtilityClient); | 371 utility_client_.reset(new ShellContentUtilityClient); |
372 return utility_client_.get(); | 372 return utility_client_.get(); |
373 } | 373 } |
374 | 374 |
375 } // namespace content | 375 } // namespace content |
OLD | NEW |