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

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

Issue 1408793009: media: Remove BrowserCdmFactory inferface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment for DEPS change. Created 5 years, 1 month 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 | « content/public/browser/DEPS ('k') | content/public/browser/content_browser_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 } 47 }
48 48
49 namespace blink { 49 namespace blink {
50 struct WebWindowFeatures; 50 struct WebWindowFeatures;
51 } 51 }
52 52
53 namespace gfx { 53 namespace gfx {
54 class ImageSkia; 54 class ImageSkia;
55 } 55 }
56 56
57 namespace media {
58 class CdmFactory;
59 }
60
57 namespace mojo { 61 namespace mojo {
58 class ApplicationDelegate; 62 class ApplicationDelegate;
59 } 63 }
60 64
61 namespace net { 65 namespace net {
62 class CookieOptions; 66 class CookieOptions;
63 class NetLog; 67 class NetLog;
64 class SSLCertRequestInfo; 68 class SSLCertRequestInfo;
65 class SSLInfo; 69 class SSLInfo;
66 class URLRequest; 70 class URLRequest;
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 virtual void RecordURLMetric(const std::string& metric, const GURL& url) {} 706 virtual void RecordURLMetric(const std::string& metric, const GURL& url) {}
703 707
704 // Allows the embedder to register one or more NavigationThrottles for the 708 // Allows the embedder to register one or more NavigationThrottles for the
705 // navigation indicated by |navigation_handle|. A NavigationThrottle is used 709 // navigation indicated by |navigation_handle|. A NavigationThrottle is used
706 // to control the flow of a navigation on the UI thread. The embedder is 710 // to control the flow of a navigation on the UI thread. The embedder is
707 // guaranteed that the throttles will be executed in the order they were 711 // guaranteed that the throttles will be executed in the order they were
708 // provided. 712 // provided.
709 virtual ScopedVector<NavigationThrottle> CreateThrottlesForNavigation( 713 virtual ScopedVector<NavigationThrottle> CreateThrottlesForNavigation(
710 NavigationHandle* navigation_handle); 714 NavigationHandle* navigation_handle);
711 715
716 // Creates and returns a factory used for creating CDM instances for playing
717 // protected content.
718 virtual scoped_ptr<media::CdmFactory> CreateCdmFactory();
719
712 // Populates |mappings| with all files that need to be mapped before launching 720 // Populates |mappings| with all files that need to be mapped before launching
713 // a child process. 721 // a child process.
714 #if defined(OS_ANDROID) 722 #if defined(OS_ANDROID)
715 virtual void GetAdditionalMappedFilesForChildProcess( 723 virtual void GetAdditionalMappedFilesForChildProcess(
716 const base::CommandLine& command_line, 724 const base::CommandLine& command_line,
717 int child_process_id, 725 int child_process_id,
718 content::FileDescriptorInfo* mappings, 726 content::FileDescriptorInfo* mappings,
719 std::map<int, base::MemoryMappedFile::Region>* regions) {} 727 std::map<int, base::MemoryMappedFile::Region>* regions) {}
720 #elif defined(OS_POSIX) && !defined(OS_MACOSX) 728 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
721 virtual void GetAdditionalMappedFilesForChildProcess( 729 virtual void GetAdditionalMappedFilesForChildProcess(
(...skipping 23 matching lines...) Expand all
745 // Allows an embedder to provide its own ExternalVideoSurfaceContainer 753 // Allows an embedder to provide its own ExternalVideoSurfaceContainer
746 // implementation. Return nullptr to disable external surface video. 754 // implementation. Return nullptr to disable external surface video.
747 virtual ExternalVideoSurfaceContainer* 755 virtual ExternalVideoSurfaceContainer*
748 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents); 756 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents);
749 #endif 757 #endif
750 }; 758 };
751 759
752 } // namespace content 760 } // namespace content
753 761
754 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 762 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « content/public/browser/DEPS ('k') | content/public/browser/content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698