| Index: chrome/browser/renderer_preferences_util.cc
|
| diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc
|
| index d47d2d0e51f05f37ea74868f914df6eef75c7289..ad5e3017221badabb2f640eebbfa41df4326b7db 100644
|
| --- a/chrome/browser/renderer_preferences_util.cc
|
| +++ b/chrome/browser/renderer_preferences_util.cc
|
| @@ -26,6 +26,10 @@
|
| #include "ui/views/controls/textfield/textfield.h"
|
| #endif
|
|
|
| +#if defined(OS_MACOSX)
|
| +#include "ui/base/cocoa/defaults_utils.h"
|
| +#endif
|
| +
|
| #if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
| #include "chrome/browser/themes/theme_service.h"
|
| #include "chrome/browser/themes/theme_service_factory.h"
|
| @@ -120,6 +124,12 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
|
| prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0;
|
| #endif
|
|
|
| +#if defined(OS_MACOSX)
|
| + base::TimeDelta interval;
|
| + if (ui::TextInsertionCaretBlinkPeriod(&interval))
|
| + prefs->caret_blink_interval = interval.InSecondsF();
|
| +#endif
|
| +
|
| #if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
| views::LinuxUI* linux_ui = views::LinuxUI::instance();
|
| if (linux_ui) {
|
|
|