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

Side by Side Diff: chrome/common/chrome_content_client.h

Issue 2582463003: media: Verify CDM Host files (Closed)
Patch Set: comments addressed 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
« no previous file with comments | « chrome/common/chrome_constants.cc ('k') | chrome/common/chrome_content_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 CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ 5 #ifndef CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
6 #define CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ 6 #define CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 // The method is only visible for testing purposes. 66 // The method is only visible for testing purposes.
67 static content::PepperPluginInfo* FindMostRecentPlugin( 67 static content::PepperPluginInfo* FindMostRecentPlugin(
68 const std::vector<std::unique_ptr<content::PepperPluginInfo>>& plugins); 68 const std::vector<std::unique_ptr<content::PepperPluginInfo>>& plugins);
69 #endif 69 #endif
70 70
71 void SetActiveURL(const GURL& url) override; 71 void SetActiveURL(const GURL& url) override;
72 void SetGpuInfo(const gpu::GPUInfo& gpu_info) override; 72 void SetGpuInfo(const gpu::GPUInfo& gpu_info) override;
73 void AddPepperPlugins( 73 void AddPepperPlugins(
74 std::vector<content::PepperPluginInfo>* plugins) override; 74 std::vector<content::PepperPluginInfo>* plugins) override;
75 void AddContentDecryptionModules( 75 void AddContentDecryptionModules(
76 std::vector<content::CdmInfo>* cdms) override; 76 std::vector<content::CdmInfo>* cdms,
77 std::vector<content::CdmHostFilePath>* cdm_host_file_paths) override;
78
77 void AddAdditionalSchemes(Schemes* schemes) override; 79 void AddAdditionalSchemes(Schemes* schemes) override;
78 std::string GetProduct() const override; 80 std::string GetProduct() const override;
79 std::string GetUserAgent() const override; 81 std::string GetUserAgent() const override;
80 base::string16 GetLocalizedString(int message_id) const override; 82 base::string16 GetLocalizedString(int message_id) const override;
81 base::StringPiece GetDataResource( 83 base::StringPiece GetDataResource(
82 int resource_id, 84 int resource_id,
83 ui::ScaleFactor scale_factor) const override; 85 ui::ScaleFactor scale_factor) const override;
84 base::RefCountedMemory* GetDataResourceBytes( 86 base::RefCountedMemory* GetDataResourceBytes(
85 int resource_id) const override; 87 int resource_id) const override;
86 gfx::Image& GetNativeImageNamed(int resource_id) const override; 88 gfx::Image& GetNativeImageNamed(int resource_id) const override;
(...skipping 13 matching lines...) Expand all
100 102
101 #if defined(OS_ANDROID) 103 #if defined(OS_ANDROID)
102 media::MediaClientAndroid* GetMediaClientAndroid() override; 104 media::MediaClientAndroid* GetMediaClientAndroid() override;
103 #endif // OS_ANDROID 105 #endif // OS_ANDROID
104 106
105 private: 107 private:
106 std::unique_ptr<ChromeOriginTrialPolicy> origin_trial_policy_; 108 std::unique_ptr<ChromeOriginTrialPolicy> origin_trial_policy_;
107 }; 109 };
108 110
109 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ 111 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/common/chrome_constants.cc ('k') | chrome/common/chrome_content_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698