third_party/WebKit/Source/web/WebSettingsImpl.h - Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink.

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

Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink. (Closed)

Patch Set: Fixed missign deprecated preference registration. Created 4 years, 3 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:

« no previous file with comments | « third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp ('k') | third_party/WebKit/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 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
49 void setFromStrings(const WebString& name, const WebString& value) override;	49 void setFromStrings(const WebString& name, const WebString& value) override;

50	50

51 bool mainFrameResizesAreOrientationChanges() const override;	51 bool mainFrameResizesAreOrientationChanges() const override;

52 bool shrinksViewportContentToFit() const override;	52 bool shrinksViewportContentToFit() const override;

53 bool viewportEnabled() const override;	53 bool viewportEnabled() const override;

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

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

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

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

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

59 void setAllowDisplayOfInsecureContent(bool) override;

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

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

62 void setAllowGeolocationOnInsecureOrigins(bool) override;	61 void setAllowGeolocationOnInsecureOrigins(bool) override;

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

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

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

66 void setAlwaysShowContextMenuOnTouch(bool) override;	65 void setAlwaysShowContextMenuOnTouch(bool) override;

67 void setAntialiased2dCanvasEnabled(bool) override;	66 void setAntialiased2dCanvasEnabled(bool) override;

68 void setAntialiasedClips2dCanvasEnabled(bool) override;	67 void setAntialiasedClips2dCanvasEnabled(bool) override;

69 void setAutoplayExperimentMode(const WebString&) override;	68 void setAutoplayExperimentMode(const WebString&) override;

(...skipping 159 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
229 bool m_viewportMetaNonUserScalableQuirk;	228 bool m_viewportMetaNonUserScalableQuirk;

230 // This quirk is to maintain compatibility with Android apps built on	229 // This quirk is to maintain compatibility with Android apps built on

231 // the Android SDK prior to and including version 18. Presumably, this	230 // the Android SDK prior to and including version 18. Presumably, this

232 // can be removed any time after 2015. See http://crbug.com/313754.	231 // can be removed any time after 2015. See http://crbug.com/313754.

233 bool m_clobberUserAgentInitialScaleQuirk;	232 bool m_clobberUserAgentInitialScaleQuirk;

234 };	233 };

235	234

236 } // namespace blink	235 } // namespace blink

237	236

238 #endif	237 #endif

OLD	NEW