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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 parsed_command_line->AppendSwitchNative( | 93 parsed_command_line->AppendSwitchNative( |
94 switches::kRegisterPepperPlugins, plugin_descriptor); | 94 switches::kRegisterPepperPlugins, plugin_descriptor); |
95 } | 95 } |
96 | 96 |
97 // Disable profiler timing by default. | 97 // Disable profiler timing by default. |
98 if (!parsed_command_line->HasSwitch(switches::kProfilerTiming)) { | 98 if (!parsed_command_line->HasSwitch(switches::kProfilerTiming)) { |
99 parsed_command_line->AppendSwitchASCII( | 99 parsed_command_line->AppendSwitchASCII( |
100 switches::kProfilerTiming, switches::kProfilerTimingDisabledValue); | 100 switches::kProfilerTiming, switches::kProfilerTimingDisabledValue); |
101 } | 101 } |
102 | 102 |
| 103 #if !defined(USE_AURA) |
103 cc::LayerSettings layer_settings; | 104 cc::LayerSettings layer_settings; |
104 if (parsed_command_line->HasSwitch( | 105 if (parsed_command_line->HasSwitch( |
105 switches::kEnableAndroidCompositorAnimationTimelines)) | 106 switches::kEnableAndroidCompositorAnimationTimelines)) |
106 layer_settings.use_compositor_animation_timelines = true; | 107 layer_settings.use_compositor_animation_timelines = true; |
107 Compositor::SetLayerSettings(layer_settings); | 108 Compositor::SetLayerSettings(layer_settings); |
| 109 #endif |
108 } | 110 } |
109 | 111 |
110 } // namespace content | 112 } // namespace content |
OLD | NEW |