| 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 23 matching lines...) Expand all Loading... |
| 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 "ppapi/features/features.h" | 39 #include "ppapi/features/features.h" |
| 40 #include "ui/base/resource/resource_bundle.h" | 40 #include "ui/base/resource/resource_bundle.h" |
| 41 #include "ui/base/ui_base_paths.h" | 41 #include "ui/base/ui_base_paths.h" |
| 42 #include "ui/base/ui_base_switches.h" | 42 #include "ui/base/ui_base_switches.h" |
| 43 #include "ui/display/display_switches.h" | 43 #include "ui/display/display_switches.h" |
| 44 #include "ui/events/event_switches.h" | |
| 45 #include "ui/gl/gl_switches.h" | 44 #include "ui/gl/gl_switches.h" |
| 46 | 45 |
| 47 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. | 46 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. |
| 48 | 47 |
| 49 #if defined(IPC_MESSAGE_LOG_ENABLED) | 48 #if defined(IPC_MESSAGE_LOG_ENABLED) |
| 50 #define IPC_MESSAGE_MACROS_LOG_ENABLED | 49 #define IPC_MESSAGE_MACROS_LOG_ENABLED |
| 51 #include "content/public/common/content_ipc_logging.h" | 50 #include "content/public/common/content_ipc_logging.h" |
| 52 #define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \ | 51 #define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \ |
| 53 content::RegisterIPCLogger(msg_id, logger) | 52 content::RegisterIPCLogger(msg_id, logger) |
| 54 #include "content/shell/common/shell_messages.h" | 53 #include "content/shell/common/shell_messages.h" |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 command_line.AppendSwitch(switches::kProcessPerTab); | 166 command_line.AppendSwitch(switches::kProcessPerTab); |
| 168 command_line.AppendSwitch(switches::kEnableLogging); | 167 command_line.AppendSwitch(switches::kEnableLogging); |
| 169 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); | 168 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); |
| 170 // only default to osmesa if the flag isn't already specified. | 169 // only default to osmesa if the flag isn't already specified. |
| 171 if (!command_line.HasSwitch(switches::kUseGpuInTests) && | 170 if (!command_line.HasSwitch(switches::kUseGpuInTests) && |
| 172 !command_line.HasSwitch(switches::kUseGL)) { | 171 !command_line.HasSwitch(switches::kUseGL)) { |
| 173 command_line.AppendSwitchASCII(switches::kUseGL, | 172 command_line.AppendSwitchASCII(switches::kUseGL, |
| 174 gl::kGLImplementationOSMesaName); | 173 gl::kGLImplementationOSMesaName); |
| 175 } | 174 } |
| 176 command_line.AppendSwitch(switches::kSkipGpuDataLoading); | 175 command_line.AppendSwitch(switches::kSkipGpuDataLoading); |
| 177 command_line.AppendSwitchASCII(switches::kTouchEvents, | 176 command_line.AppendSwitchASCII( |
| 178 switches::kTouchEventsEnabled); | 177 switches::kTouchEventFeatureDetection, |
| 178 switches::kTouchEventFeatureDetectionEnabled); |
| 179 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor)) | 179 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor)) |
| 180 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); | 180 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); |
| 181 command_line.AppendSwitch( | 181 command_line.AppendSwitch( |
| 182 switches::kDisableGestureRequirementForMediaPlayback); | 182 switches::kDisableGestureRequirementForMediaPlayback); |
| 183 | 183 |
| 184 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { | 184 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { |
| 185 command_line.AppendSwitch( | 185 command_line.AppendSwitch( |
| 186 switches::kEnableExperimentalWebPlatformFeatures); | 186 switches::kEnableExperimentalWebPlatformFeatures); |
| 187 } | 187 } |
| 188 | 188 |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 | 367 |
| 368 return renderer_client_.get(); | 368 return renderer_client_.get(); |
| 369 } | 369 } |
| 370 | 370 |
| 371 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { | 371 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { |
| 372 utility_client_.reset(new ShellContentUtilityClient); | 372 utility_client_.reset(new ShellContentUtilityClient); |
| 373 return utility_client_.get(); | 373 return utility_client_.get(); |
| 374 } | 374 } |
| 375 | 375 |
| 376 } // namespace content | 376 } // namespace content |
| OLD | NEW |