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

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

Issue 248863003: Add a chrome://flags item "allow-insecure-websocket-from-https-origin" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed #9 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
« no previous file with comments | « content/public/common/content_switches.cc ('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 757 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 webview()->settings()->setAcceleratedCompositingForFixedRootBackgroundEnabled( 768 webview()->settings()->setAcceleratedCompositingForFixedRootBackgroundEnabled(
769 ShouldUseAcceleratedFixedRootBackground(device_scale_factor_)); 769 ShouldUseAcceleratedFixedRootBackground(device_scale_factor_));
770 webview()->settings()->setCompositedScrollingForFramesEnabled( 770 webview()->settings()->setCompositedScrollingForFramesEnabled(
771 ShouldUseCompositedScrollingForFrames(device_scale_factor_)); 771 ShouldUseCompositedScrollingForFrames(device_scale_factor_));
772 webview()->settings() 772 webview()->settings()
773 ->setAcceleratedCompositingForGpuRasterizationHintEnabled( 773 ->setAcceleratedCompositingForGpuRasterizationHintEnabled(
774 ShouldUseCompositingForGpuRasterizationHint()); 774 ShouldUseCompositingForGpuRasterizationHint());
775 775
776 ApplyWebPreferences(webkit_preferences_, webview()); 776 ApplyWebPreferences(webkit_preferences_, webview());
777 777
778 webview()->settings()->setAllowConnectingInsecureWebSocket(
779 command_line.HasSwitch(switches::kAllowInsecureWebSocketFromHttpsOrigin));
780
778 main_render_frame_.reset(main_render_frame); 781 main_render_frame_.reset(main_render_frame);
779 webview()->setMainFrame(main_render_frame_->GetWebFrame()); 782 webview()->setMainFrame(main_render_frame_->GetWebFrame());
780 main_render_frame_->Initialize(); 783 main_render_frame_->Initialize();
781 784
782 if (switches::IsTouchDragDropEnabled()) 785 if (switches::IsTouchDragDropEnabled())
783 webview()->settings()->setTouchDragDropEnabled(true); 786 webview()->settings()->setTouchDragDropEnabled(true);
784 787
785 if (switches::IsTouchEditingEnabled()) 788 if (switches::IsTouchEditingEnabled())
786 webview()->settings()->setTouchEditingEnabled(true); 789 webview()->settings()->setTouchEditingEnabled(true);
787 790
(...skipping 3651 matching lines...) Expand 10 before | Expand all | Expand 10 after
4439 std::vector<gfx::Size> sizes; 4442 std::vector<gfx::Size> sizes;
4440 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4443 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4441 if (!url.isEmpty()) 4444 if (!url.isEmpty())
4442 urls.push_back( 4445 urls.push_back(
4443 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4446 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4444 } 4447 }
4445 SendUpdateFaviconURL(urls); 4448 SendUpdateFaviconURL(urls);
4446 } 4449 }
4447 4450
4448 } // namespace content 4451 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698