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

Side by Side Diff: chrome/renderer/render_view.cc

Issue 398003: linux: Use gtk-cursor-blink from GtkSettings to set the caret blink interval (Closed)
Patch Set: latest Created 10 years, 10 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
« no previous file with comments | « chrome/common/renderer_preferences.h ('k') | no next file » | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/renderer/render_view.h" 5 #include "chrome/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 #include "webkit/glue/plugins/webplugin_delegate_impl.h" 108 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
109 #include "webkit/glue/webdropdata.h" 109 #include "webkit/glue/webdropdata.h"
110 #include "webkit/glue/webkit_glue.h" 110 #include "webkit/glue/webkit_glue.h"
111 #include "webkit/glue/webmediaplayer_impl.h" 111 #include "webkit/glue/webmediaplayer_impl.h"
112 #include "webkit/glue/webplugin_impl.h" 112 #include "webkit/glue/webplugin_impl.h"
113 113
114 #if defined(OS_WIN) 114 #if defined(OS_WIN)
115 // TODO(port): these files are currently Windows only because they concern: 115 // TODO(port): these files are currently Windows only because they concern:
116 // * theming 116 // * theming
117 #include "app/gfx/native_theme_win.h" 117 #include "app/gfx/native_theme_win.h"
118 #elif defined(OS_LINUX)
119 #include "third_party/WebKit/WebKit/chromium/public/linux/WebRenderTheme.h"
118 #endif 120 #endif
119 121
120 using appcache::WebApplicationCacheHostImpl; 122 using appcache::WebApplicationCacheHostImpl;
121 using base::Time; 123 using base::Time;
122 using base::TimeDelta; 124 using base::TimeDelta;
123 using webkit_glue::AltErrorPageResourceFetcher; 125 using webkit_glue::AltErrorPageResourceFetcher;
124 using webkit_glue::FormFieldValues; 126 using webkit_glue::FormFieldValues;
125 using webkit_glue::ImageResourceFetcher; 127 using webkit_glue::ImageResourceFetcher;
126 using webkit_glue::PasswordForm; 128 using webkit_glue::PasswordForm;
127 using webkit_glue::PasswordFormDomManager; 129 using webkit_glue::PasswordFormDomManager;
(...skipping 3314 matching lines...) Expand 10 before | Expand all | Expand 10 after
3442 &RenderView::CheckPreferredSize); 3444 &RenderView::CheckPreferredSize);
3443 } 3445 }
3444 } 3446 }
3445 3447
3446 void RenderView::OnSetRendererPrefs(const RendererPreferences& renderer_prefs) { 3448 void RenderView::OnSetRendererPrefs(const RendererPreferences& renderer_prefs) {
3447 renderer_preferences_ = renderer_prefs; 3449 renderer_preferences_ = renderer_prefs;
3448 UpdateFontRenderingFromRendererPrefs(); 3450 UpdateFontRenderingFromRendererPrefs();
3449 #if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS) 3451 #if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
3450 WebColorName name = WebKit::WebColorWebkitFocusRingColor; 3452 WebColorName name = WebKit::WebColorWebkitFocusRingColor;
3451 WebKit::setNamedColors(&name, &renderer_prefs.focus_ring_color, 1); 3453 WebKit::setNamedColors(&name, &renderer_prefs.focus_ring_color, 1);
3454 WebKit::setCaretBlinkInterval(renderer_prefs.caret_blink_interval);
3452 3455
3453 if (webview()) { 3456 if (webview()) {
3454 webview()->setScrollbarColors( 3457 webview()->setScrollbarColors(
3455 renderer_prefs.thumb_inactive_color, 3458 renderer_prefs.thumb_inactive_color,
3456 renderer_prefs.thumb_active_color, 3459 renderer_prefs.thumb_active_color,
3457 renderer_prefs.track_color); 3460 renderer_prefs.track_color);
3458 webview()->setSelectionColors( 3461 webview()->setSelectionColors(
3459 renderer_prefs.active_selection_bg_color, 3462 renderer_prefs.active_selection_bg_color,
3460 renderer_prefs.active_selection_fg_color, 3463 renderer_prefs.active_selection_fg_color,
3461 renderer_prefs.inactive_selection_bg_color, 3464 renderer_prefs.inactive_selection_bg_color,
(...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after
4213 new PluginMsg_SignalModalDialogEvent(host_window_)); 4216 new PluginMsg_SignalModalDialogEvent(host_window_));
4214 4217
4215 message->EnableMessagePumping(); // Runs a nested message loop. 4218 message->EnableMessagePumping(); // Runs a nested message loop.
4216 bool rv = Send(message); 4219 bool rv = Send(message);
4217 4220
4218 PluginChannelHost::Broadcast( 4221 PluginChannelHost::Broadcast(
4219 new PluginMsg_ResetModalDialogEvent(host_window_)); 4222 new PluginMsg_ResetModalDialogEvent(host_window_));
4220 4223
4221 return rv; 4224 return rv;
4222 } 4225 }
OLDNEW
« no previous file with comments | « chrome/common/renderer_preferences.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698