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

Side by Side Diff: content/public/common/content_client.cc

Issue 1996723002: Switch ResourceBundle LoadDataResourceBytes to return RefCountedMemory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update to address newly added use Created 4 years, 6 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 | « content/public/common/content_client.h ('k') | content/shell/common/shell_content_client.h » ('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 #include "content/public/common/content_client.h" 5 #include "content/public/common/content_client.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/string_piece.h" 8 #include "base/strings/string_piece.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "content/public/common/origin_util.h" 10 #include "content/public/common/origin_util.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 base::string16 ContentClient::GetLocalizedString(int message_id) const { 85 base::string16 ContentClient::GetLocalizedString(int message_id) const {
86 return base::string16(); 86 return base::string16();
87 } 87 }
88 88
89 base::StringPiece ContentClient::GetDataResource( 89 base::StringPiece ContentClient::GetDataResource(
90 int resource_id, 90 int resource_id,
91 ui::ScaleFactor scale_factor) const { 91 ui::ScaleFactor scale_factor) const {
92 return base::StringPiece(); 92 return base::StringPiece();
93 } 93 }
94 94
95 base::RefCountedStaticMemory* ContentClient::GetDataResourceBytes( 95 base::RefCountedMemory* ContentClient::GetDataResourceBytes(
96 int resource_id) const { 96 int resource_id) const {
97 return NULL; 97 return nullptr;
98 } 98 }
99 99
100 gfx::Image& ContentClient::GetNativeImageNamed(int resource_id) const { 100 gfx::Image& ContentClient::GetNativeImageNamed(int resource_id) const {
101 CR_DEFINE_STATIC_LOCAL(gfx::Image, kEmptyImage, ()); 101 CR_DEFINE_STATIC_LOCAL(gfx::Image, kEmptyImage, ());
102 return kEmptyImage; 102 return kEmptyImage;
103 } 103 }
104 104
105 std::string ContentClient::GetProcessTypeNameInEnglish(int type) { 105 std::string ContentClient::GetProcessTypeNameInEnglish(int type) {
106 NOTIMPLEMENTED(); 106 NOTIMPLEMENTED();
107 return std::string(); 107 return std::string();
(...skipping 24 matching lines...) Expand all
132 bool ContentClient::UsingSynchronousCompositing() { 132 bool ContentClient::UsingSynchronousCompositing() {
133 return false; 133 return false;
134 } 134 }
135 135
136 media::MediaClientAndroid* ContentClient::GetMediaClientAndroid() { 136 media::MediaClientAndroid* ContentClient::GetMediaClientAndroid() {
137 return nullptr; 137 return nullptr;
138 } 138 }
139 #endif // OS_ANDROID 139 #endif // OS_ANDROID
140 140
141 } // namespace content 141 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/content_client.h ('k') | content/shell/common/shell_content_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698