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

Side by Side Diff: content/shell/common/shell_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
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/shell/common/shell_content_client.h" 5 #include "content/shell/common/shell_content_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_piece.h" 8 #include "base/strings/string_piece.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "blink/public/resources/grit/blink_image_resources.h" 10 #include "blink/public/resources/grit/blink_image_resources.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 case IDR_TEXTAREA_RESIZER: 92 case IDR_TEXTAREA_RESIZER:
93 resource_id = IDR_CONTENT_SHELL_TEXT_AREA_RESIZE_CORNER_PNG; 93 resource_id = IDR_CONTENT_SHELL_TEXT_AREA_RESIZE_CORNER_PNG;
94 break; 94 break;
95 } 95 }
96 } 96 }
97 return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale( 97 return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
98 resource_id, scale_factor); 98 resource_id, scale_factor);
99 } 99 }
100 100
101 base::RefCountedStaticMemory* ShellContentClient::GetDataResourceBytes( 101 base::RefCountedMemory* ShellContentClient::GetDataResourceBytes(
102 int resource_id) const { 102 int resource_id) const {
103 return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id); 103 return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id);
104 } 104 }
105 105
106 gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const { 106 gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const {
107 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id); 107 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
108 } 108 }
109 109
110 bool ShellContentClient::IsSupplementarySiteIsolationModeEnabled() { 110 bool ShellContentClient::IsSupplementarySiteIsolationModeEnabled() {
111 return base::CommandLine::ForCurrentProcess()->HasSwitch( 111 return base::CommandLine::ForCurrentProcess()->HasSwitch(
112 switches::kIsolateSitesForTesting); 112 switches::kIsolateSitesForTesting);
113 } 113 }
114 114
115 base::StringPiece ShellContentClient::GetOriginTrialPublicKey() { 115 base::StringPiece ShellContentClient::GetOriginTrialPublicKey() {
116 return origin_trial_public_key_; 116 return origin_trial_public_key_;
117 } 117 }
118 118
119 } // namespace content 119 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/common/shell_content_client.h ('k') | extensions/shell/common/shell_content_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698