Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(337)

Side by Side Diff: chrome/browser/ui/webui/chromeos/salsa_ui.cc

Issue 18603008: Seperate horizontal and vertical overscrolling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed broken unit test Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/gesture_prefs_observer_factory_aura.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gesture_prefs_observer_factory_aura.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698