| 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/browser/android/content_startup_flags.h" | 5 #include "content/browser/android/content_startup_flags.h" |
| 6 | 6 |
| 7 #include "base/android/build_info.h" | 7 #include "base/android/build_info.h" |
| 8 #include "base/base_switches.h" | 8 #include "base/base_switches.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 // internal code checks this directly, but it wouldn't normally get set when | 35 // internal code checks this directly, but it wouldn't normally get set when |
| 36 // we are implementing an embedded WebView. | 36 // we are implementing an embedded WebView. |
| 37 parsed_command_line->AppendSwitch(switches::kSingleProcess); | 37 parsed_command_line->AppendSwitch(switches::kSingleProcess); |
| 38 } | 38 } |
| 39 | 39 |
| 40 parsed_command_line->AppendSwitch(cc::switches::kEnableBeginFrameScheduling); | 40 parsed_command_line->AppendSwitch(cc::switches::kEnableBeginFrameScheduling); |
| 41 | 41 |
| 42 parsed_command_line->AppendSwitch(switches::kEnablePinch); | 42 parsed_command_line->AppendSwitch(switches::kEnablePinch); |
| 43 parsed_command_line->AppendSwitch(switches::kEnableOverlayScrollbar); | 43 parsed_command_line->AppendSwitch(switches::kEnableOverlayScrollbar); |
| 44 parsed_command_line->AppendSwitch(switches::kValidateInputEventStream); | 44 parsed_command_line->AppendSwitch(switches::kValidateInputEventStream); |
| 45 parsed_command_line->AppendSwitch( |
| 46 switches::kEnableMediaDocumentDownloadButton); |
| 45 | 47 |
| 46 if (base::android::BuildInfo::GetInstance()->sdk_int() >= | 48 if (base::android::BuildInfo::GetInstance()->sdk_int() >= |
| 47 base::android::SDK_VERSION_MARSHMALLOW) { | 49 base::android::SDK_VERSION_MARSHMALLOW) { |
| 48 parsed_command_line->AppendSwitch(switches::kEnableLongpressDragSelection); | 50 parsed_command_line->AppendSwitch(switches::kEnableLongpressDragSelection); |
| 49 parsed_command_line->AppendSwitchASCII( | 51 parsed_command_line->AppendSwitchASCII( |
| 50 switches::kTouchTextSelectionStrategy, "direction"); | 52 switches::kTouchTextSelectionStrategy, "direction"); |
| 51 } | 53 } |
| 52 | 54 |
| 53 // There is no software fallback on Android, so don't limit GPU crashes. | 55 // There is no software fallback on Android, so don't limit GPU crashes. |
| 54 parsed_command_line->AppendSwitch(switches::kDisableGpuProcessCrashLimit); | 56 parsed_command_line->AppendSwitch(switches::kDisableGpuProcessCrashLimit); |
| (...skipping 26 matching lines...) Expand all Loading... |
| 81 } | 83 } |
| 82 | 84 |
| 83 cc::LayerSettings layer_settings; | 85 cc::LayerSettings layer_settings; |
| 84 layer_settings.use_compositor_animation_timelines = | 86 layer_settings.use_compositor_animation_timelines = |
| 85 !parsed_command_line->HasSwitch( | 87 !parsed_command_line->HasSwitch( |
| 86 switches::kDisableAndroidCompositorAnimationTimelines); | 88 switches::kDisableAndroidCompositorAnimationTimelines); |
| 87 Compositor::SetLayerSettings(layer_settings); | 89 Compositor::SetLayerSettings(layer_settings); |
| 88 } | 90 } |
| 89 | 91 |
| 90 } // namespace content | 92 } // namespace content |
| OLD | NEW |