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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 11299074: Make use_aura set use_default_render_theme and moves (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merge 2 trunk and update some ifdefs Created 8 years 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/browser/renderer_preferences_util.cc ('k') | webkit/glue/webkit_glue.gypi » ('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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 5262 matching lines...) Expand 10 before | Expand all | Expand 10 after
5273 #if defined(TOOLKIT_GTK) 5273 #if defined(TOOLKIT_GTK)
5274 WebColorName name = WebKit::WebColorWebkitFocusRingColor; 5274 WebColorName name = WebKit::WebColorWebkitFocusRingColor;
5275 WebKit::setNamedColors(&name, &renderer_prefs.focus_ring_color, 1); 5275 WebKit::setNamedColors(&name, &renderer_prefs.focus_ring_color, 1);
5276 WebKit::setCaretBlinkInterval(renderer_prefs.caret_blink_interval); 5276 WebKit::setCaretBlinkInterval(renderer_prefs.caret_blink_interval);
5277 ui::NativeTheme::instance()->SetScrollbarColors( 5277 ui::NativeTheme::instance()->SetScrollbarColors(
5278 renderer_prefs.thumb_inactive_color, 5278 renderer_prefs.thumb_inactive_color,
5279 renderer_prefs.thumb_active_color, 5279 renderer_prefs.thumb_active_color,
5280 renderer_prefs.track_color); 5280 renderer_prefs.track_color);
5281 #endif 5281 #endif
5282 5282
5283 #if defined(USE_ASH) || defined(TOOLKIT_GTK) 5283 #if defined(USE_DEFAULT_RENDER_THEME) || defined(TOOLKIT_GTK)
5284 if (webview()) { 5284 if (webview()) {
5285 #if defined(TOOLKIT_GTK) 5285 #if defined(TOOLKIT_GTK)
5286 webview()->setScrollbarColors( 5286 webview()->setScrollbarColors(
5287 renderer_prefs.thumb_inactive_color, 5287 renderer_prefs.thumb_inactive_color,
5288 renderer_prefs.thumb_active_color, 5288 renderer_prefs.thumb_active_color,
5289 renderer_prefs.track_color); 5289 renderer_prefs.track_color);
5290 #endif 5290 #endif
5291 webview()->setSelectionColors( 5291 webview()->setSelectionColors(
5292 renderer_prefs.active_selection_bg_color, 5292 renderer_prefs.active_selection_bg_color,
5293 renderer_prefs.active_selection_fg_color, 5293 renderer_prefs.active_selection_fg_color,
(...skipping 1146 matching lines...) Expand 10 before | Expand all | Expand 10 after
6440 } 6440 }
6441 #endif 6441 #endif
6442 6442
6443 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( 6443 void RenderViewImpl::OnReleaseDisambiguationPopupDIB(
6444 TransportDIB::Handle dib_handle) { 6444 TransportDIB::Handle dib_handle) {
6445 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); 6445 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
6446 RenderProcess::current()->ReleaseTransportDIB(dib); 6446 RenderProcess::current()->ReleaseTransportDIB(dib);
6447 } 6447 }
6448 6448
6449 } // namespace content 6449 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/renderer_preferences_util.cc ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698