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

Side by Side Diff: content/public/browser/content_browser_client.h

Issue 1905033002: PlzNavigate: Move navigation-level mixed content checks to the browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@console-security-message
Patch Set: Overall code cleanup to request reviewers to PTAL. 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 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 736
737 // Allows the embedder to provide its own AudioManager implementation. 737 // Allows the embedder to provide its own AudioManager implementation.
738 // If this function returns nullptr, a default platform implementation 738 // If this function returns nullptr, a default platform implementation
739 // will be used. 739 // will be used.
740 virtual media::ScopedAudioManagerPtr CreateAudioManager( 740 virtual media::ScopedAudioManagerPtr CreateAudioManager(
741 media::AudioLogFactory* audio_log_factory); 741 media::AudioLogFactory* audio_log_factory);
742 // Creates and returns a factory used for creating CDM instances for playing 742 // Creates and returns a factory used for creating CDM instances for playing
743 // protected content. 743 // protected content.
744 virtual std::unique_ptr<media::CdmFactory> CreateCdmFactory(); 744 virtual std::unique_ptr<media::CdmFactory> CreateCdmFactory();
745 745
746 // Checks if displaying of mixed-content is allowed for the specified
747 // WebContents/tab.
748 virtual bool ShouldAllowDisplayingInsecureContent(bool allowed_per_settings,
749 const GURL& resource_url,
750 WebContents* web_contents);
751
752 // Checks if running of mixed-content is allowed for the specified
753 // WebContents/tab.
754 virtual bool ShouldAllowRunningInsecureContent(bool allowed_per_settings,
755 const url::Origin& origin,
756 const GURL& resource_url,
757 WebContents* web_contents);
758
746 // Populates |mappings| with all files that need to be mapped before launching 759 // Populates |mappings| with all files that need to be mapped before launching
747 // a child process. 760 // a child process.
748 #if defined(OS_ANDROID) 761 #if defined(OS_ANDROID)
749 virtual void GetAdditionalMappedFilesForChildProcess( 762 virtual void GetAdditionalMappedFilesForChildProcess(
750 const base::CommandLine& command_line, 763 const base::CommandLine& command_line,
751 int child_process_id, 764 int child_process_id,
752 content::FileDescriptorInfo* mappings, 765 content::FileDescriptorInfo* mappings,
753 std::map<int, base::MemoryMappedFile::Region>* regions) {} 766 std::map<int, base::MemoryMappedFile::Region>* regions) {}
754 #elif defined(OS_POSIX) && !defined(OS_MACOSX) 767 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
755 virtual void GetAdditionalMappedFilesForChildProcess( 768 virtual void GetAdditionalMappedFilesForChildProcess(
(...skipping 27 matching lines...) Expand all
783 // Allows an embedder to provide its own ExternalVideoSurfaceContainer 796 // Allows an embedder to provide its own ExternalVideoSurfaceContainer
784 // implementation. Return nullptr to disable external surface video. 797 // implementation. Return nullptr to disable external surface video.
785 virtual ExternalVideoSurfaceContainer* 798 virtual ExternalVideoSurfaceContainer*
786 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents); 799 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents);
787 #endif 800 #endif
788 }; 801 };
789 802
790 } // namespace content 803 } // namespace content
791 804
792 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 805 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698