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

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

Issue 2167513002: Remove InsecureContentInfobarDelegate, which has been broken for a while (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
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 #include <memory> 9 #include <memory>
10 10
(...skipping 985 matching lines...) Expand 10 before | Expand all | Expand 10 after
996 // default value if not). 996 // default value if not).
997 settings->setAccelerated2dCanvasMSAASampleCount( 997 settings->setAccelerated2dCanvasMSAASampleCount(
998 prefs.accelerated_2d_canvas_msaa_sample_count); 998 prefs.accelerated_2d_canvas_msaa_sample_count);
999 999
1000 settings->setUnifiedTextCheckerEnabled(prefs.unified_textchecker_enabled); 1000 settings->setUnifiedTextCheckerEnabled(prefs.unified_textchecker_enabled);
1001 1001
1002 // Tabs to link is not part of the settings. WebCore calls 1002 // Tabs to link is not part of the settings. WebCore calls
1003 // ChromeClient::tabsToLinks which is part of the glue code. 1003 // ChromeClient::tabsToLinks which is part of the glue code.
1004 web_view->setTabsToLinks(prefs.tabs_to_links); 1004 web_view->setTabsToLinks(prefs.tabs_to_links);
1005 1005
1006 settings->setAllowDisplayOfInsecureContent(
1007 prefs.allow_displaying_insecure_content);
1008 settings->setAllowRunningOfInsecureContent( 1006 settings->setAllowRunningOfInsecureContent(
1009 prefs.allow_running_insecure_content); 1007 prefs.allow_running_insecure_content);
1010 settings->setDisableReadingFromCanvas(prefs.disable_reading_from_canvas); 1008 settings->setDisableReadingFromCanvas(prefs.disable_reading_from_canvas);
1011 settings->setStrictMixedContentChecking(prefs.strict_mixed_content_checking); 1009 settings->setStrictMixedContentChecking(prefs.strict_mixed_content_checking);
1012 1010
1013 settings->setStrictlyBlockBlockableMixedContent( 1011 settings->setStrictlyBlockBlockableMixedContent(
1014 prefs.strictly_block_blockable_mixed_content); 1012 prefs.strictly_block_blockable_mixed_content);
1015 1013
1016 settings->setStrictMixedContentCheckingForPlugin( 1014 settings->setStrictMixedContentCheckingForPlugin(
1017 prefs.block_mixed_plugin_content); 1015 prefs.block_mixed_plugin_content);
(...skipping 2222 matching lines...) Expand 10 before | Expand all | Expand 10 after
3240 return render_frame->focused_pepper_plugin(); 3238 return render_frame->focused_pepper_plugin();
3241 } 3239 }
3242 frame = frame->traverseNext(false); 3240 frame = frame->traverseNext(false);
3243 } 3241 }
3244 3242
3245 return nullptr; 3243 return nullptr;
3246 } 3244 }
3247 #endif 3245 #endif
3248 3246
3249 } // namespace content 3247 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698