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

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: Addressed all jam@ latest comments. Created 3 years, 11 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 744 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 755
756 // Allows the embedder to provide its own AudioManager implementation. 756 // Allows the embedder to provide its own AudioManager implementation.
757 // If this function returns nullptr, a default platform implementation 757 // If this function returns nullptr, a default platform implementation
758 // will be used. 758 // will be used.
759 virtual media::ScopedAudioManagerPtr CreateAudioManager( 759 virtual media::ScopedAudioManagerPtr CreateAudioManager(
760 media::AudioLogFactory* audio_log_factory); 760 media::AudioLogFactory* audio_log_factory);
761 // Creates and returns a factory used for creating CDM instances for playing 761 // Creates and returns a factory used for creating CDM instances for playing
762 // protected content. 762 // protected content.
763 virtual std::unique_ptr<media::CdmFactory> CreateCdmFactory(); 763 virtual std::unique_ptr<media::CdmFactory> CreateCdmFactory();
764 764
765 // Reports that passive mixed content was found at the specified WebContents.
766 virtual void PassiveInsecureContentFound(const GURL& resource_url);
767
768 // Checks if running of mixed-content is allowed for the specified
769 // WebContents/tab.
770 virtual bool ShouldAllowRunningInsecureContent(bool allowed_per_settings,
jam 2017/01/09 21:15:46 this method should be on WebContentsDelegate. Cont
carlosk 2017/01/10 19:13:11 Understood and thanks for this explanation. But n
jam 2017/01/10 19:28:37 right. browser is the one that's currently adding
carlosk 2017/01/10 20:03:59 There is logic that is specific to layout tests th
carlosk 2017/01/11 03:32:21 Done.
771 const url::Origin& origin,
772 const GURL& resource_url,
773 WebContents* web_contents);
774
765 // Populates |mappings| with all files that need to be mapped before launching 775 // Populates |mappings| with all files that need to be mapped before launching
766 // a child process. 776 // a child process.
767 #if defined(OS_ANDROID) 777 #if defined(OS_ANDROID)
768 virtual void GetAdditionalMappedFilesForChildProcess( 778 virtual void GetAdditionalMappedFilesForChildProcess(
769 const base::CommandLine& command_line, 779 const base::CommandLine& command_line,
770 int child_process_id, 780 int child_process_id,
771 content::FileDescriptorInfo* mappings, 781 content::FileDescriptorInfo* mappings,
772 std::map<int, base::MemoryMappedFile::Region>* regions) {} 782 std::map<int, base::MemoryMappedFile::Region>* regions) {}
773 #elif defined(OS_POSIX) && !defined(OS_MACOSX) 783 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
774 virtual void GetAdditionalMappedFilesForChildProcess( 784 virtual void GetAdditionalMappedFilesForChildProcess(
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 virtual bool ShouldRedirectDOMStorageTaskRunner(); 830 virtual bool ShouldRedirectDOMStorageTaskRunner();
821 831
822 // If this returns true, all BrowserThreads (but UI/IO) that support it on 832 // If this returns true, all BrowserThreads (but UI/IO) that support it on
823 // this platform will experimentally be redirected to TaskScheduler. 833 // this platform will experimentally be redirected to TaskScheduler.
824 virtual bool RedirectNonUINonIOBrowserThreadsToTaskScheduler(); 834 virtual bool RedirectNonUINonIOBrowserThreadsToTaskScheduler();
825 }; 835 };
826 836
827 } // namespace content 837 } // namespace content
828 838
829 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 839 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698