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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/gesture_prefs_observer_factory_aura.cc

Issue 14622003: components: Move PrefRegistrySyncable into user_prefs namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/gesture_prefs_observer_factory_aura.h ('k') | chrome/browser/ui/gtk/browser_window_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
diff --git a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
index 5efd242841bfcb46169df74e09c16964da7a41f6..7d4a3fb77be5d1ca39db0c6e6f1351e382cb6e50 100644
--- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
+++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
@@ -360,34 +360,36 @@ ProfileKeyedService* GesturePrefsObserverFactoryAura::BuildServiceInstanceFor(
}
void GesturePrefsObserverFactoryAura::RegisterOverscrollPrefs(
- PrefRegistrySyncable* registry) {
+ user_prefs::PrefRegistrySyncable* registry) {
const std::vector<OverscrollPref>& overscroll_prefs = GetOverscrollPrefs();
for (size_t i = 0; i < overscroll_prefs.size(); ++i) {
registry->RegisterDoublePref(
overscroll_prefs[i].pref_name,
content::GetOverscrollConfig(overscroll_prefs[i].config),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
}
}
void GesturePrefsObserverFactoryAura::RegisterFlingCurveParameters(
- PrefRegistrySyncable* registry) {
+ user_prefs::PrefRegistrySyncable* registry) {
content::RendererPreferences def_prefs;
for (size_t i = 0; i < arraysize(kFlingTouchpadPrefs); i++)
- registry->RegisterDoublePref(kFlingTouchpadPrefs[i],
- def_prefs.touchpad_fling_profile[i],
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterDoublePref(
+ kFlingTouchpadPrefs[i],
+ def_prefs.touchpad_fling_profile[i],
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
for (size_t i = 0; i < arraysize(kFlingTouchscreenPrefs); i++)
- registry->RegisterDoublePref(kFlingTouchscreenPrefs[i],
- def_prefs.touchscreen_fling_profile[i],
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterDoublePref(
+ kFlingTouchscreenPrefs[i],
+ def_prefs.touchscreen_fling_profile[i],
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
}
void GesturePrefsObserverFactoryAura::RegisterWorkspaceCyclerPrefs(
- PrefRegistrySyncable* registry) {
+ user_prefs::PrefRegistrySyncable* registry) {
#if defined(USE_ASH)
const std::vector<WorkspaceCyclerPref>& cycler_prefs =
GetWorkspaceCyclerPrefs();
@@ -398,132 +400,133 @@ void GesturePrefsObserverFactoryAura::RegisterWorkspaceCyclerPrefs(
registry->RegisterListPref(
cycler_prefs[i].pref_name,
WorkspaceCyclerConfiguration::GetListValue(property).DeepCopy(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
} else {
registry->RegisterDoublePref(
cycler_prefs[i].pref_name,
WorkspaceCyclerConfiguration::GetDouble(property),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
}
}
#endif // USE_ASH
}
void GesturePrefsObserverFactoryAura::RegisterUserPrefs(
- PrefRegistrySyncable* registry) {
+ user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterDoublePref(
prefs::kFlingAccelerationCurveCoefficient0,
GestureConfiguration::fling_acceleration_curve_coefficients(0),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kFlingAccelerationCurveCoefficient1,
GestureConfiguration::fling_acceleration_curve_coefficients(1),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kFlingAccelerationCurveCoefficient2,
GestureConfiguration::fling_acceleration_curve_coefficients(2),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kFlingAccelerationCurveCoefficient3,
GestureConfiguration::fling_acceleration_curve_coefficients(3),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterIntegerPref(
prefs::kFlingMaxCancelToDownTimeInMs,
GestureConfiguration::fling_max_cancel_to_down_time_in_ms(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterIntegerPref(
prefs::kFlingMaxTapGapTimeInMs,
GestureConfiguration::fling_max_tap_gap_time_in_ms(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterIntegerPref(
prefs::kTabScrubActivationDelayInMS,
GestureConfiguration::tab_scrub_activation_delay_in_ms(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kFlingVelocityCap,
GestureConfiguration::fling_velocity_cap(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kLongPressTimeInSeconds,
GestureConfiguration::long_press_time_in_seconds(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kSemiLongPressTimeInSeconds,
GestureConfiguration::semi_long_press_time_in_seconds(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kMaxDistanceForTwoFingerTapInPixels,
GestureConfiguration::max_distance_for_two_finger_tap_in_pixels(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kMaxSecondsBetweenDoubleClick,
GestureConfiguration::max_seconds_between_double_click(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kMaxSeparationForGestureTouchesInPixels,
GestureConfiguration::max_separation_for_gesture_touches_in_pixels(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kMaxSwipeDeviationRatio,
GestureConfiguration::max_swipe_deviation_ratio(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kMaxTouchDownDurationInSecondsForClick,
GestureConfiguration::max_touch_down_duration_in_seconds_for_click(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kMaxTouchMoveInPixelsForClick,
GestureConfiguration::max_touch_move_in_pixels_for_click(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kMaxDistanceBetweenTapsForDoubleTap,
GestureConfiguration::max_distance_between_taps_for_double_tap(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kMinDistanceForPinchScrollInPixels,
GestureConfiguration::min_distance_for_pinch_scroll_in_pixels(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kMinFlickSpeedSquared,
GestureConfiguration::min_flick_speed_squared(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kMinPinchUpdateDistanceInPixels,
GestureConfiguration::min_pinch_update_distance_in_pixels(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kMinRailBreakVelocity,
GestureConfiguration::min_rail_break_velocity(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kMinScrollDeltaSquared,
GestureConfiguration::min_scroll_delta_squared(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kMinSwipeSpeed,
GestureConfiguration::min_swipe_speed(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kMinTouchDownDurationInSecondsForClick,
GestureConfiguration::min_touch_down_duration_in_seconds_for_click(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterIntegerPref(
prefs::kPointsBufferedForVelocity,
GestureConfiguration::points_buffered_for_velocity(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kRailBreakProportion,
GestureConfiguration::rail_break_proportion(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterDoublePref(
prefs::kRailStartProportion,
GestureConfiguration::rail_start_proportion(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
// Register for migration.
- registry->RegisterDoublePref(kTouchScreenFlingAccelerationAdjustment,
- 0.0,
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterDoublePref(
+ kTouchScreenFlingAccelerationAdjustment,
+ 0.0,
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
RegisterOverscrollPrefs(registry);
RegisterFlingCurveParameters(registry);
« no previous file with comments | « chrome/browser/ui/gesture_prefs_observer_factory_aura.h ('k') | chrome/browser/ui/gtk/browser_window_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698