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

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

Issue 1907263003: media: Set MediaClientAndroid in the GPU process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/DEPS ('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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 88
89 void AddServiceWorkerSchemes(std::set<std::string>* schemes) override; 89 void AddServiceWorkerSchemes(std::set<std::string>* schemes) override;
90 90
91 bool IsSupplementarySiteIsolationModeEnabled() override; 91 bool IsSupplementarySiteIsolationModeEnabled() override;
92 base::StringPiece GetOriginTrialPublicKey() override; 92 base::StringPiece GetOriginTrialPublicKey() override;
93 93
94 OriginTrialKeyManager* origin_trial_key_manager() { 94 OriginTrialKeyManager* origin_trial_key_manager() {
95 return &origin_trial_key_manager_; 95 return &origin_trial_key_manager_;
96 } 96 }
97 97
98 #if defined(OS_ANDROID)
99 media::MediaClientAndroid* GetMediaClientAndroid() override;
100 #endif // OS_ANDROID
101
98 private: 102 private:
99 OriginTrialKeyManager origin_trial_key_manager_; 103 OriginTrialKeyManager origin_trial_key_manager_;
100 }; 104 };
101 105
102 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ 106 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/common/DEPS ('k') | chrome/common/chrome_content_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698