Chromium Code Reviews| 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/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "cc/base/switches.h" | 10 #include "cc/base/switches.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 54 switches::kEnableCompositingForFixedPosition); | 54 switches::kEnableCompositingForFixedPosition); |
| 55 parsed_command_line->AppendSwitch(switches::kEnableAcceleratedOverflowScroll); | 55 parsed_command_line->AppendSwitch(switches::kEnableAcceleratedOverflowScroll); |
| 56 parsed_command_line->AppendSwitch( | 56 parsed_command_line->AppendSwitch( |
| 57 switches::kEnableAcceleratedScrollableFrames); | 57 switches::kEnableAcceleratedScrollableFrames); |
| 58 parsed_command_line->AppendSwitch( | 58 parsed_command_line->AppendSwitch( |
| 59 switches::kEnableCompositedScrollingForFrames); | 59 switches::kEnableCompositedScrollingForFrames); |
| 60 | 60 |
| 61 parsed_command_line->AppendSwitch(switches::kEnableGestureTapHighlight); | 61 parsed_command_line->AppendSwitch(switches::kEnableGestureTapHighlight); |
| 62 parsed_command_line->AppendSwitch(switches::kEnablePinch); | 62 parsed_command_line->AppendSwitch(switches::kEnablePinch); |
| 63 parsed_command_line->AppendSwitch(switches::kEnableOverscrollNotifications); | 63 parsed_command_line->AppendSwitch(switches::kEnableOverscrollNotifications); |
| 64 parsed_command_line->AppendSwitch(cc::switches::kForceSolidColorScrollbars); | |
| 65 | |
| 66 std::string thickness_string(cc::switches::kSolidColorScrollbarThickness); | |
| 67 thickness_string.append("=3"); | |
|
bulach
2013/06/28 19:55:48
nit: maybe extract these as named constants up abo
| |
| 68 parsed_command_line->AppendSwitch(thickness_string); | |
| 69 | |
| 70 std::string color_string(cc::switches::kSolidColorScrollbarColor); | |
| 71 color_string.append("=0x80808080"); | |
| 72 parsed_command_line->AppendSwitch(color_string); | |
| 64 | 73 |
| 65 // Run the GPU service as a thread in the browser instead of as a | 74 // Run the GPU service as a thread in the browser instead of as a |
| 66 // standalone process. | 75 // standalone process. |
| 67 parsed_command_line->AppendSwitch(switches::kInProcessGPU); | 76 parsed_command_line->AppendSwitch(switches::kInProcessGPU); |
| 68 parsed_command_line->AppendSwitch(switches::kDisableGpuShaderDiskCache); | 77 parsed_command_line->AppendSwitch(switches::kDisableGpuShaderDiskCache); |
| 69 | 78 |
| 70 // Always use fixed layout and viewport tag. | 79 // Always use fixed layout and viewport tag. |
| 71 parsed_command_line->AppendSwitch(switches::kEnableFixedLayout); | 80 parsed_command_line->AppendSwitch(switches::kEnableFixedLayout); |
| 72 parsed_command_line->AppendSwitch(switches::kEnableViewport); | 81 parsed_command_line->AppendSwitch(switches::kEnableViewport); |
| 73 | 82 |
| 74 if (!plugin_descriptor.empty()) { | 83 if (!plugin_descriptor.empty()) { |
| 75 parsed_command_line->AppendSwitchNative( | 84 parsed_command_line->AppendSwitchNative( |
| 76 switches::kRegisterPepperPlugins, plugin_descriptor); | 85 switches::kRegisterPepperPlugins, plugin_descriptor); |
| 77 } | 86 } |
| 78 } | 87 } |
| 79 | 88 |
| 80 } // namespace content | 89 } // namespace content |
| OLD | NEW |