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