| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "cc/settings.h" | 8 #include "cc/settings.h" |
| 9 #include "cc/switches.h" | 9 #include "cc/switches.h" |
| 10 | 10 |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 s_acceleratedAnimationEnabled = enabled; | 102 s_acceleratedAnimationEnabled = enabled; |
| 103 } | 103 } |
| 104 | 104 |
| 105 void Settings::setPageScalePinchZoomEnabled(bool enabled) | 105 void Settings::setPageScalePinchZoomEnabled(bool enabled) |
| 106 { | 106 { |
| 107 if (!s_settingsInitialized) | 107 if (!s_settingsInitialized) |
| 108 reset(); | 108 reset(); |
| 109 s_pageScalePinchZoomEnabled = enabled; | 109 s_pageScalePinchZoomEnabled = enabled; |
| 110 } | 110 } |
| 111 | 111 |
| 112 } // namespace cc | 112 } // namespace cc |
| OLD | NEW |