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

Side by Side Diff: chrome/browser/renderer_preferences_util.cc

Issue 43503002: Remove fling curve profiles from renderer preferences assuming that be turn on Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 | « no previous file | chrome/browser/ui/gesture_prefs_observer_factory_aura.cc » ('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 (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 "chrome/browser/renderer_preferences_util.h" 5 #include "chrome/browser/renderer_preferences_util.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/common/pref_names.h" 9 #include "chrome/common/pref_names.h"
10 #include "content/public/common/renderer_preferences.h" 10 #include "content/public/common/renderer_preferences.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 #elif defined(USE_DEFAULT_RENDER_THEME) 111 #elif defined(USE_DEFAULT_RENDER_THEME)
112 prefs->focus_ring_color = SkColorSetRGB(0x4D, 0x90, 0xFE); 112 prefs->focus_ring_color = SkColorSetRGB(0x4D, 0x90, 0xFE);
113 113
114 #if !defined(OS_WIN) 114 #if !defined(OS_WIN)
115 // This color is 0x544d90fe modulated with 0xffffff. 115 // This color is 0x544d90fe modulated with 0xffffff.
116 prefs->active_selection_bg_color = SkColorSetRGB(0xCB, 0xE4, 0xFA); 116 prefs->active_selection_bg_color = SkColorSetRGB(0xCB, 0xE4, 0xFA);
117 prefs->active_selection_fg_color = SK_ColorBLACK; 117 prefs->active_selection_fg_color = SK_ColorBLACK;
118 prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA); 118 prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA);
119 prefs->inactive_selection_fg_color = SK_ColorBLACK; 119 prefs->inactive_selection_fg_color = SK_ColorBLACK;
120 #endif 120 #endif
121
122 prefs->touchpad_fling_profile[0] =
123 pref_service->GetDouble(prefs::kFlingCurveTouchpadAlpha);
124 prefs->touchpad_fling_profile[1] =
125 pref_service->GetDouble(prefs::kFlingCurveTouchpadBeta);
126 prefs->touchpad_fling_profile[2] =
127 pref_service->GetDouble(prefs::kFlingCurveTouchpadGamma);
128 prefs->touchscreen_fling_profile[0] =
129 pref_service->GetDouble(prefs::kFlingCurveTouchscreenAlpha);
130 prefs->touchscreen_fling_profile[1] =
131 pref_service->GetDouble(prefs::kFlingCurveTouchscreenBeta);
132 prefs->touchscreen_fling_profile[2] =
133 pref_service->GetDouble(prefs::kFlingCurveTouchscreenGamma);
134 #endif 121 #endif
135 122
136 #if defined(TOOLKIT_VIEWS) 123 #if defined(TOOLKIT_VIEWS)
137 prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0; 124 prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0;
138 #endif 125 #endif
139 126
140 #if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) 127 #if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
141 views::LinuxUI* linux_ui = views::LinuxUI::instance(); 128 views::LinuxUI* linux_ui = views::LinuxUI::instance();
142 if (linux_ui) { 129 if (linux_ui) {
143 if (ThemeServiceFactory::GetForProfile(profile)->UsingNativeTheme()) { 130 if (ThemeServiceFactory::GetForProfile(profile)->UsingNativeTheme()) {
(...skipping 26 matching lines...) Expand all
170 GetRendererPreferencesSubpixelRenderingEnum(params.subpixel_rendering); 157 GetRendererPreferencesSubpixelRenderingEnum(params.subpixel_rendering);
171 #endif 158 #endif
172 159
173 #if !defined(OS_MACOSX) 160 #if !defined(OS_MACOSX)
174 prefs->plugin_fullscreen_allowed = 161 prefs->plugin_fullscreen_allowed =
175 pref_service->GetBoolean(prefs::kFullscreenAllowed); 162 pref_service->GetBoolean(prefs::kFullscreenAllowed);
176 #endif 163 #endif
177 } 164 }
178 165
179 } // namespace renderer_preferences_util 166 } // namespace renderer_preferences_util
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/gesture_prefs_observer_factory_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698