Source/web/WebSettingsImpl.h - Issue 246893014: Add a WebSettings item to turn off mixed content check for WebSocket

Side by Side Diff: Source/web/WebSettingsImpl.h

Issue 246893014: Add a WebSettings item to turn off mixed content check for WebSocket (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: 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

« Source/core/loader/MixedContentChecker.h ('K') | « Source/core/loader/MixedContentChecker.cpp ('k') | Source/web/WebSettingsImpl.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2009 Google Inc. All rights reserved.	2 * Copyright (C) 2009 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 51 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
62 virtual void setAcceleratedCompositingForOverflowScrollEnabled(bool) OVERRID E;	62 virtual void setAcceleratedCompositingForOverflowScrollEnabled(bool) OVERRID E;

63 virtual void setCompositorDrivenAcceleratedScrollingEnabled(bool) OVERRIDE;	63 virtual void setCompositorDrivenAcceleratedScrollingEnabled(bool) OVERRIDE;

64 virtual void setAcceleratedCompositingForFixedRootBackgroundEnabled(bool) OV ERRIDE;	64 virtual void setAcceleratedCompositingForFixedRootBackgroundEnabled(bool) OV ERRIDE;

65 virtual void setAcceleratedCompositingForGpuRasterizationHintEnabled(bool) O VERRIDE;	65 virtual void setAcceleratedCompositingForGpuRasterizationHintEnabled(bool) O VERRIDE;

66 virtual void setAcceleratedCompositingForPluginsEnabled(bool) OVERRIDE;	66 virtual void setAcceleratedCompositingForPluginsEnabled(bool) OVERRIDE;

67 virtual void setAcceleratedCompositingForVideoEnabled(bool) OVERRIDE;	67 virtual void setAcceleratedCompositingForVideoEnabled(bool) OVERRIDE;

68 virtual void setAllowDisplayOfInsecureContent(bool) OVERRIDE;	68 virtual void setAllowDisplayOfInsecureContent(bool) OVERRIDE;

69 virtual void setAllowFileAccessFromFileURLs(bool) OVERRIDE;	69 virtual void setAllowFileAccessFromFileURLs(bool) OVERRIDE;

70 virtual void setAllowCustomScrollbarInMainFrame(bool) OVERRIDE;	70 virtual void setAllowCustomScrollbarInMainFrame(bool) OVERRIDE;

71 virtual void setAllowRunningOfInsecureContent(bool) OVERRIDE;	71 virtual void setAllowRunningOfInsecureContent(bool) OVERRIDE;

	72 virtual void setAllowConnectingInsecureWebSocket(bool) OVERRIDE;

72 virtual void setAllowScriptsToCloseWindows(bool) OVERRIDE;	73 virtual void setAllowScriptsToCloseWindows(bool) OVERRIDE;

73 virtual void setAllowUniversalAccessFromFileURLs(bool) OVERRIDE;	74 virtual void setAllowUniversalAccessFromFileURLs(bool) OVERRIDE;

74 virtual void setAntialiased2dCanvasEnabled(bool) OVERRIDE;	75 virtual void setAntialiased2dCanvasEnabled(bool) OVERRIDE;

75 virtual void setAsynchronousSpellCheckingEnabled(bool) OVERRIDE;	76 virtual void setAsynchronousSpellCheckingEnabled(bool) OVERRIDE;

76 virtual void setAutoZoomFocusedNodeToLegibleScale(bool) OVERRIDE;	77 virtual void setAutoZoomFocusedNodeToLegibleScale(bool) OVERRIDE;

77 virtual void setCaretBrowsingEnabled(bool) OVERRIDE;	78 virtual void setCaretBrowsingEnabled(bool) OVERRIDE;

78 virtual void setClobberUserAgentInitialScaleQuirk(bool) OVERRIDE;	79 virtual void setClobberUserAgentInitialScaleQuirk(bool) OVERRIDE;

79 virtual void setCompositedScrollingForFramesEnabled(bool) OVERRIDE;	80 virtual void setCompositedScrollingForFramesEnabled(bool) OVERRIDE;

80 virtual void setCompositorTouchHitTesting(bool) OVERRIDE;	81 virtual void setCompositorTouchHitTesting(bool) OVERRIDE;

81 virtual void setContainerCullingEnabled(bool) OVERRIDE;	82 virtual void setContainerCullingEnabled(bool) OVERRIDE;

(...skipping 135 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
217 // This quirk is to maintain compatibility with Android apps built on	218 // This quirk is to maintain compatibility with Android apps built on

218 // the Android SDK prior to and including version 18. Presumably, this	219 // the Android SDK prior to and including version 18. Presumably, this

219 // can be removed any time after 2015. See http://crbug.com/313754.	220 // can be removed any time after 2015. See http://crbug.com/313754.

220 bool m_clobberUserAgentInitialScaleQuirk;	221 bool m_clobberUserAgentInitialScaleQuirk;

221 bool m_mainFrameResizesAreOrientationChanges;	222 bool m_mainFrameResizesAreOrientationChanges;

222 };	223 };

223	224

224 } // namespace blink	225 } // namespace blink

225	226

226 #endif	227 #endif

OLD	NEW