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

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

Issue 438843002: Delete code for inspector preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build. Created 6 years, 4 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
« no previous file with comments | « content/renderer/render_view_impl.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) 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 1007 matching lines...) Expand 10 before | Expand all | Expand 10 after
1018 // Enable deferred filter rendering if requested on the command line. 1018 // Enable deferred filter rendering if requested on the command line.
1019 settings->setDeferredFiltersEnabled(prefs.deferred_filters_enabled); 1019 settings->setDeferredFiltersEnabled(prefs.deferred_filters_enabled);
1020 1020
1021 // Enable container culling if requested on the command line. 1021 // Enable container culling if requested on the command line.
1022 settings->setContainerCullingEnabled(prefs.container_culling_enabled); 1022 settings->setContainerCullingEnabled(prefs.container_culling_enabled);
1023 1023
1024 settings->setAsynchronousSpellCheckingEnabled( 1024 settings->setAsynchronousSpellCheckingEnabled(
1025 prefs.asynchronous_spell_checking_enabled); 1025 prefs.asynchronous_spell_checking_enabled);
1026 settings->setUnifiedTextCheckerEnabled(prefs.unified_textchecker_enabled); 1026 settings->setUnifiedTextCheckerEnabled(prefs.unified_textchecker_enabled);
1027 1027
1028 for (WebInspectorPreferences::const_iterator it =
1029 prefs.inspector_settings.begin();
1030 it != prefs.inspector_settings.end();
1031 ++it) {
1032 web_view->setInspectorSetting(WebString::fromUTF8(it->first),
1033 WebString::fromUTF8(it->second));
1034 }
1035
1036 // Tabs to link is not part of the settings. WebCore calls 1028 // Tabs to link is not part of the settings. WebCore calls
1037 // ChromeClient::tabsToLinks which is part of the glue code. 1029 // ChromeClient::tabsToLinks which is part of the glue code.
1038 web_view->setTabsToLinks(prefs.tabs_to_links); 1030 web_view->setTabsToLinks(prefs.tabs_to_links);
1039 1031
1040 settings->setAllowDisplayOfInsecureContent( 1032 settings->setAllowDisplayOfInsecureContent(
1041 prefs.allow_displaying_insecure_content); 1033 prefs.allow_displaying_insecure_content);
1042 settings->setAllowRunningOfInsecureContent( 1034 settings->setAllowRunningOfInsecureContent(
1043 prefs.allow_running_insecure_content); 1035 prefs.allow_running_insecure_content);
1044 settings->setPasswordEchoEnabled(prefs.password_echo_enabled); 1036 settings->setPasswordEchoEnabled(prefs.password_echo_enabled);
1045 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds); 1037 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds);
(...skipping 986 matching lines...) Expand 10 before | Expand all | Expand 10 after
2032 2024
2033 int RenderViewImpl::historyForwardListCount() { 2025 int RenderViewImpl::historyForwardListCount() {
2034 return history_list_length_ - historyBackListCount() - 1; 2026 return history_list_length_ - historyBackListCount() - 1;
2035 } 2027 }
2036 2028
2037 void RenderViewImpl::postAccessibilityEvent( 2029 void RenderViewImpl::postAccessibilityEvent(
2038 const WebAXObject& obj, blink::WebAXEvent event) { 2030 const WebAXObject& obj, blink::WebAXEvent event) {
2039 main_render_frame()->HandleWebAccessibilityEvent(obj, event); 2031 main_render_frame()->HandleWebAccessibilityEvent(obj, event);
2040 } 2032 }
2041 2033
2042 void RenderViewImpl::didUpdateInspectorSetting(const WebString& key,
2043 const WebString& value) {
2044 Send(new ViewHostMsg_UpdateInspectorSetting(routing_id_,
2045 key.utf8(),
2046 value.utf8()));
2047 }
2048
2049 // blink::WebWidgetClient ---------------------------------------------------- 2034 // blink::WebWidgetClient ----------------------------------------------------
2050 2035
2051 void RenderViewImpl::didFocus() { 2036 void RenderViewImpl::didFocus() {
2052 // TODO(jcivelli): when https://bugs.webkit.org/show_bug.cgi?id=33389 is fixed 2037 // TODO(jcivelli): when https://bugs.webkit.org/show_bug.cgi?id=33389 is fixed
2053 // we won't have to test for user gesture anymore and we can 2038 // we won't have to test for user gesture anymore and we can
2054 // move that code back to render_widget.cc 2039 // move that code back to render_widget.cc
2055 if (WebUserGestureIndicator::isProcessingUserGesture() && 2040 if (WebUserGestureIndicator::isProcessingUserGesture() &&
2056 !RenderThreadImpl::current()->layout_test_mode()) { 2041 !RenderThreadImpl::current()->layout_test_mode()) {
2057 Send(new ViewHostMsg_Focus(routing_id_)); 2042 Send(new ViewHostMsg_Focus(routing_id_));
2058 } 2043 }
(...skipping 2216 matching lines...) Expand 10 before | Expand all | Expand 10 after
4275 std::vector<gfx::Size> sizes; 4260 std::vector<gfx::Size> sizes;
4276 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4261 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4277 if (!url.isEmpty()) 4262 if (!url.isEmpty())
4278 urls.push_back( 4263 urls.push_back(
4279 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4264 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4280 } 4265 }
4281 SendUpdateFaviconURL(urls); 4266 SendUpdateFaviconURL(urls);
4282 } 4267 }
4283 4268
4284 } // namespace content 4269 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698