Source/web/WebSettingsImpl.h - Issue 1031833004: Remove allowConnectingInsecureWebSocket Settings item

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

Issue 1031833004: Remove allowConnectingInsecureWebSocket Settings item (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fixed build Created 5 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

« no previous file with comments | « 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 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53 virtual void setAccelerated2dCanvasEnabled(bool) override;	53 virtual void setAccelerated2dCanvasEnabled(bool) override;

54 virtual void setAccelerated2dCanvasMSAASampleCount(int) override;	54 virtual void setAccelerated2dCanvasMSAASampleCount(int) override;

55 virtual void setAcceleratedCompositingEnabled(bool) override;	55 virtual void setAcceleratedCompositingEnabled(bool) override;

56 virtual void setPreferCompositingToLCDTextEnabled(bool) override;	56 virtual void setPreferCompositingToLCDTextEnabled(bool) override;

57 virtual void setAccessibilityEnabled(bool) override;	57 virtual void setAccessibilityEnabled(bool) override;

58 virtual void setAccessibilityPasswordValuesEnabled(bool) override;	58 virtual void setAccessibilityPasswordValuesEnabled(bool) override;

59 virtual void setAllowDisplayOfInsecureContent(bool) override;	59 virtual void setAllowDisplayOfInsecureContent(bool) override;

60 virtual void setAllowFileAccessFromFileURLs(bool) override;	60 virtual void setAllowFileAccessFromFileURLs(bool) override;

61 virtual void setAllowCustomScrollbarInMainFrame(bool) override;	61 virtual void setAllowCustomScrollbarInMainFrame(bool) override;

62 virtual void setAllowRunningOfInsecureContent(bool) override;	62 virtual void setAllowRunningOfInsecureContent(bool) override;

63 virtual void setAllowConnectingInsecureWebSocket(bool) override;

64 virtual void setAllowScriptsToCloseWindows(bool) override;	63 virtual void setAllowScriptsToCloseWindows(bool) override;

65 virtual void setAllowUniversalAccessFromFileURLs(bool) override;	64 virtual void setAllowUniversalAccessFromFileURLs(bool) override;

66 virtual void setAntialiased2dCanvasEnabled(bool) override;	65 virtual void setAntialiased2dCanvasEnabled(bool) override;

67 virtual void setAntialiasedClips2dCanvasEnabled(bool) override;	66 virtual void setAntialiasedClips2dCanvasEnabled(bool) override;

68 virtual void setAsynchronousSpellCheckingEnabled(bool) override;	67 virtual void setAsynchronousSpellCheckingEnabled(bool) override;

69 virtual void setAutoZoomFocusedNodeToLegibleScale(bool) override;	68 virtual void setAutoZoomFocusedNodeToLegibleScale(bool) override;

70 virtual void setCaretBrowsingEnabled(bool) override;	69 virtual void setCaretBrowsingEnabled(bool) override;

71 virtual void setClobberUserAgentInitialScaleQuirk(bool) override;	70 virtual void setClobberUserAgentInitialScaleQuirk(bool) override;

72 virtual void setCookieEnabled(bool) override;	71 virtual void setCookieEnabled(bool) override;

73 virtual void setNavigateOnDragDrop(bool) override;	72 virtual void setNavigateOnDragDrop(bool) override;

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

225 // the Android SDK prior to and including version 18. Presumably, this	224 // the Android SDK prior to and including version 18. Presumably, this

226 // can be removed any time after 2015. See http://crbug.com/313754.	225 // can be removed any time after 2015. See http://crbug.com/313754.

227 bool m_clobberUserAgentInitialScaleQuirk;	226 bool m_clobberUserAgentInitialScaleQuirk;

228 bool m_mainFrameResizesAreOrientationChanges;	227 bool m_mainFrameResizesAreOrientationChanges;

229 };	228 };

230	229

231 } // namespace blink	230 } // namespace blink

232	231

233 #endif	232 #endif

OLD	NEW