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/string_number_conversions.h" | 7 #include "base/string_number_conversions.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "cc/switches.h" | 10 #include "cc/switches.h" |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 parsed_command_line->AppendSwitch(switches::kEnablePinch); | 62 parsed_command_line->AppendSwitch(switches::kEnablePinch); |
63 | 63 |
64 // Run the GPU service as a thread in the browser instead of as a | 64 // Run the GPU service as a thread in the browser instead of as a |
65 // standalone process. | 65 // standalone process. |
66 parsed_command_line->AppendSwitch(switches::kInProcessGPU); | 66 parsed_command_line->AppendSwitch(switches::kInProcessGPU); |
67 | 67 |
68 // Always use fixed layout and viewport tag. | 68 // Always use fixed layout and viewport tag. |
69 parsed_command_line->AppendSwitch(switches::kEnableFixedLayout); | 69 parsed_command_line->AppendSwitch(switches::kEnableFixedLayout); |
70 parsed_command_line->AppendSwitch(switches::kEnableViewport); | 70 parsed_command_line->AppendSwitch(switches::kEnableViewport); |
71 | 71 |
72 // FIXME(aelias): Commented out due to flaky tests. | 72 parsed_command_line->AppendSwitch( |
73 // parsed_command_line->AppendSwitch( | 73 cc::switches::kEnableCompositorFrameMessage); |
74 // cc::switches::kEnableCompositorFrameMessage); | |
75 } | 74 } |
76 | 75 |
77 } // namespace content | 76 } // namespace content |
OLD | NEW |