| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/ui/webui/chromeos/salsa_ui.h" | 5 #include "chrome/browser/ui/webui/chromeos/salsa_ui.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 prefs::kRailStartProportion, | 48 prefs::kRailStartProportion, |
| 49 prefs::kFlingAccelerationCurveCoefficient0, | 49 prefs::kFlingAccelerationCurveCoefficient0, |
| 50 prefs::kFlingAccelerationCurveCoefficient1, | 50 prefs::kFlingAccelerationCurveCoefficient1, |
| 51 prefs::kFlingAccelerationCurveCoefficient2, | 51 prefs::kFlingAccelerationCurveCoefficient2, |
| 52 prefs::kFlingAccelerationCurveCoefficient3, | 52 prefs::kFlingAccelerationCurveCoefficient3, |
| 53 prefs::kFlingVelocityCap, | 53 prefs::kFlingVelocityCap, |
| 54 prefs::kTabScrubActivationDelayInMS, | 54 prefs::kTabScrubActivationDelayInMS, |
| 55 prefs::kOverscrollHorizontalThresholdComplete, | 55 prefs::kOverscrollHorizontalThresholdComplete, |
| 56 prefs::kOverscrollVerticalThresholdComplete, | 56 prefs::kOverscrollVerticalThresholdComplete, |
| 57 prefs::kOverscrollMinimumThresholdStart, | 57 prefs::kOverscrollMinimumThresholdStart, |
| 58 prefs::kOverscrollVerticalThresholdStart, |
| 58 prefs::kOverscrollHorizontalResistThreshold, | 59 prefs::kOverscrollHorizontalResistThreshold, |
| 59 prefs::kOverscrollVerticalResistThreshold, | 60 prefs::kOverscrollVerticalResistThreshold, |
| 60 prefs::kImmersiveModeRevealDelayMs, | 61 prefs::kImmersiveModeRevealDelayMs, |
| 61 prefs::kImmersiveModeRevealXThresholdPixels, | 62 prefs::kImmersiveModeRevealXThresholdPixels, |
| 62 prefs::kWorkspaceCyclerSelectedScale, | 63 prefs::kWorkspaceCyclerSelectedScale, |
| 63 prefs::kWorkspaceCyclerMinScale, | 64 prefs::kWorkspaceCyclerMinScale, |
| 64 prefs::kWorkspaceCyclerMaxScale, | 65 prefs::kWorkspaceCyclerMaxScale, |
| 65 prefs::kWorkspaceCyclerMinBrightness, | 66 prefs::kWorkspaceCyclerMinBrightness, |
| 66 prefs::kWorkspaceCyclerBackgroundOpacity, | 67 prefs::kWorkspaceCyclerBackgroundOpacity, |
| 67 prefs::kWorkspaceCyclerDesktopWorkspaceBrightness, | 68 prefs::kWorkspaceCyclerDesktopWorkspaceBrightness, |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 | 192 |
| 192 if (!pref) | 193 if (!pref) |
| 193 return; | 194 return; |
| 194 | 195 |
| 195 // Get our own copy of the user defined value or NULL if they are using the | 196 // Get our own copy of the user defined value or NULL if they are using the |
| 196 // default. You have to make a copy since they'll be used in the destructor | 197 // default. You have to make a copy since they'll be used in the destructor |
| 197 // to restore the values and we need to make sure they're still around. | 198 // to restore the values and we need to make sure they're still around. |
| 198 orig_values_[index] = | 199 orig_values_[index] = |
| 199 pref->IsDefaultValue() ? NULL : pref->GetValue()->DeepCopy(); | 200 pref->IsDefaultValue() ? NULL : pref->GetValue()->DeepCopy(); |
| 200 } | 201 } |
| OLD | NEW |