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

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

Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, skip changing browser_main_loop.cc because of presubmit issues, will follow up Created 6 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 unified diff | Download patch | Annotate | Revision Log
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/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 3308 matching lines...) Expand 10 before | Expand all | Expand 10 after
3319 3319
3320 if (webview()) { 3320 if (webview()) {
3321 webview()->setSelectionColors( 3321 webview()->setSelectionColors(
3322 renderer_prefs.active_selection_bg_color, 3322 renderer_prefs.active_selection_bg_color,
3323 renderer_prefs.active_selection_fg_color, 3323 renderer_prefs.active_selection_fg_color,
3324 renderer_prefs.inactive_selection_bg_color, 3324 renderer_prefs.inactive_selection_bg_color,
3325 renderer_prefs.inactive_selection_fg_color); 3325 renderer_prefs.inactive_selection_fg_color);
3326 webview()->themeChanged(); 3326 webview()->themeChanged();
3327 } 3327 }
3328 } 3328 }
3329 #endif // defined(USE_DEFAULT_RENDER_THEME) || defined(TOOLKIT_GTK) 3329 #endif // defined(USE_DEFAULT_RENDER_THEME)
3330 3330
3331 if (RenderThreadImpl::current()) // Will be NULL during unit tests. 3331 if (RenderThreadImpl::current()) // Will be NULL during unit tests.
3332 RenderThreadImpl::current()->SetFlingCurveParameters( 3332 RenderThreadImpl::current()->SetFlingCurveParameters(
3333 renderer_prefs.touchpad_fling_profile, 3333 renderer_prefs.touchpad_fling_profile,
3334 renderer_prefs.touchscreen_fling_profile); 3334 renderer_prefs.touchscreen_fling_profile);
3335 3335
3336 // If the zoom level for this page matches the old zoom default, and this 3336 // If the zoom level for this page matches the old zoom default, and this
3337 // is not a plugin, update the zoom level to match the new default. 3337 // is not a plugin, update the zoom level to match the new default.
3338 if (webview() && !webview()->mainFrame()->document().isPluginDocument() && 3338 if (webview() && !webview()->mainFrame()->document().isPluginDocument() &&
3339 !ZoomValuesEqual(old_zoom_level, 3339 !ZoomValuesEqual(old_zoom_level,
(...skipping 1193 matching lines...) Expand 10 before | Expand all | Expand 10 after
4533 std::vector<gfx::Size> sizes(icon_urls[i].sizes().size()); 4533 std::vector<gfx::Size> sizes(icon_urls[i].sizes().size());
4534 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4534 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4535 if (!url.isEmpty()) 4535 if (!url.isEmpty())
4536 urls.push_back( 4536 urls.push_back(
4537 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4537 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4538 } 4538 }
4539 SendUpdateFaviconURL(urls); 4539 SendUpdateFaviconURL(urls);
4540 } 4540 }
4541 4541
4542 } // namespace content 4542 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_process_impl.cc ('k') | content/renderer/renderer_webkitplatformsupport_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698