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

Side by Side Diff: chromecast/common/cast_content_client.cc

Issue 2756333002: Rename MediaClientAndroid to MediaDrmBridgeClient (Closed)
Patch Set: Fix .h guards Created 3 years, 9 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 | « chromecast/common/cast_content_client.h ('k') | chromecast/common/media/BUILD.gn » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "chromecast/common/cast_content_client.h" 5 #include "chromecast/common/cast_content_client.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/sys_info.h" 10 #include "base/sys_info.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "chromecast/base/cast_constants.h" 12 #include "chromecast/base/cast_constants.h"
13 #include "chromecast/base/version.h" 13 #include "chromecast/base/version.h"
14 #include "content/public/common/user_agent.h" 14 #include "content/public/common/user_agent.h"
15 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
16 #include "ui/base/resource/resource_bundle.h" 16 #include "ui/base/resource/resource_bundle.h"
17 #include "url/url_util.h" 17 #include "url/url_util.h"
18 18
19 #if defined(OS_ANDROID) 19 #if defined(OS_ANDROID)
20 #include "chromecast/common/media/cast_media_client_android.h" 20 #include "chromecast/common/media/cast_media_drm_bridge_client.h"
21 #endif 21 #endif
22 22
23 namespace chromecast { 23 namespace chromecast {
24 namespace shell { 24 namespace shell {
25 25
26 namespace { 26 namespace {
27 27
28 #if defined(OS_ANDROID) 28 #if defined(OS_ANDROID)
29 std::string BuildAndroidOsInfo() { 29 std::string BuildAndroidOsInfo() {
30 int32_t os_major_version = 0; 30 int32_t os_major_version = 0;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 return ui::ResourceBundle::GetSharedInstance().LoadLocalizedResourceBytes( 103 return ui::ResourceBundle::GetSharedInstance().LoadLocalizedResourceBytes(
104 resource_id); 104 resource_id);
105 } 105 }
106 106
107 gfx::Image& CastContentClient::GetNativeImageNamed(int resource_id) const { 107 gfx::Image& CastContentClient::GetNativeImageNamed(int resource_id) const {
108 return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed( 108 return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
109 resource_id); 109 resource_id);
110 } 110 }
111 111
112 #if defined(OS_ANDROID) 112 #if defined(OS_ANDROID)
113 ::media::MediaClientAndroid* CastContentClient::GetMediaClientAndroid() { 113 ::media::MediaDrmBridgeClient* CastContentClient::GetMediaDrmBridgeClient() {
114 return new media::CastMediaClientAndroid(); 114 return new media::CastMediaDrmBridgeClient();
115 } 115 }
116 #endif // OS_ANDROID 116 #endif // OS_ANDROID
117 117
118 } // namespace shell 118 } // namespace shell
119 } // namespace chromecast 119 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/common/cast_content_client.h ('k') | chromecast/common/media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698