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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 parsed_command_line->AppendSwitchNative( | 73 parsed_command_line->AppendSwitchNative( |
74 switches::kRegisterPepperPlugins, plugin_descriptor); | 74 switches::kRegisterPepperPlugins, plugin_descriptor); |
75 } | 75 } |
76 | 76 |
77 // Disable profiler timing by default. | 77 // Disable profiler timing by default. |
78 if (!parsed_command_line->HasSwitch(switches::kProfilerTiming)) { | 78 if (!parsed_command_line->HasSwitch(switches::kProfilerTiming)) { |
79 parsed_command_line->AppendSwitchASCII( | 79 parsed_command_line->AppendSwitchASCII( |
80 switches::kProfilerTiming, switches::kProfilerTimingDisabledValue); | 80 switches::kProfilerTiming, switches::kProfilerTimingDisabledValue); |
81 } | 81 } |
82 | 82 |
| 83 #if !defined(USE_AURA) |
83 cc::LayerSettings layer_settings; | 84 cc::LayerSettings layer_settings; |
84 if (parsed_command_line->HasSwitch( | 85 if (parsed_command_line->HasSwitch( |
85 switches::kEnableAndroidCompositorAnimationTimelines)) | 86 switches::kEnableAndroidCompositorAnimationTimelines)) |
86 layer_settings.use_compositor_animation_timelines = true; | 87 layer_settings.use_compositor_animation_timelines = true; |
87 Compositor::SetLayerSettings(layer_settings); | 88 Compositor::SetLayerSettings(layer_settings); |
| 89 #endif |
88 } | 90 } |
89 | 91 |
90 } // namespace content | 92 } // namespace content |
OLD | NEW |