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 26 matching lines...) Expand all Loading... |
37 #include "gpu/config/gpu_switches.h" | 37 #include "gpu/config/gpu_switches.h" |
38 #include "ipc/ipc_features.h" | 38 #include "ipc/ipc_features.h" |
39 #include "media/base/media_switches.h" | 39 #include "media/base/media_switches.h" |
40 #include "media/base/mime_util.h" | 40 #include "media/base/mime_util.h" |
41 #include "net/cookies/cookie_monster.h" | 41 #include "net/cookies/cookie_monster.h" |
42 #include "ppapi/features/features.h" | 42 #include "ppapi/features/features.h" |
43 #include "ui/base/resource/resource_bundle.h" | 43 #include "ui/base/resource/resource_bundle.h" |
44 #include "ui/base/ui_base_paths.h" | 44 #include "ui/base/ui_base_paths.h" |
45 #include "ui/base/ui_base_switches.h" | 45 #include "ui/base/ui_base_switches.h" |
46 #include "ui/display/display_switches.h" | 46 #include "ui/display/display_switches.h" |
47 #include "ui/gfx/switches.h" | 47 #include "ui/gfx/color_space_switches.h" |
48 #include "ui/gl/gl_implementation.h" | 48 #include "ui/gl/gl_implementation.h" |
49 #include "ui/gl/gl_switches.h" | 49 #include "ui/gl/gl_switches.h" |
50 | 50 |
51 #if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED) | 51 #if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED) |
52 #define IPC_MESSAGE_MACROS_LOG_ENABLED | 52 #define IPC_MESSAGE_MACROS_LOG_ENABLED |
53 #include "content/public/common/content_ipc_logging.h" | 53 #include "content/public/common/content_ipc_logging.h" |
54 #define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \ | 54 #define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \ |
55 content::RegisterIPCLogger(msg_id, logger) | 55 content::RegisterIPCLogger(msg_id, logger) |
56 #include "content/shell/common/shell_messages.h" | 56 #include "content/shell/common/shell_messages.h" |
57 #endif | 57 #endif |
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
381 | 381 |
382 return renderer_client_.get(); | 382 return renderer_client_.get(); |
383 } | 383 } |
384 | 384 |
385 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { | 385 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { |
386 utility_client_.reset(new ShellContentUtilityClient); | 386 utility_client_.reset(new ShellContentUtilityClient); |
387 return utility_client_.get(); | 387 return utility_client_.get(); |
388 } | 388 } |
389 | 389 |
390 } // namespace content | 390 } // namespace content |
OLD | NEW |