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

Side by Side Diff: extensions/browser/api/execute_code_function.cc

Issue 615703002: Verify that ComponentExtensionResourceManager exists before using it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « no previous file | no next file » | 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 #ifndef EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_ 5 #ifndef EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_
6 #define EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_ 6 #define EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_
7 7
8 #include "extensions/browser/api/execute_code_function.h" 8 #include "extensions/browser/api/execute_code_function.h"
9 9
10 #include "extensions/browser/component_extension_resource_manager.h" 10 #include "extensions/browser/component_extension_resource_manager.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 if (!details_->file.get()) 199 if (!details_->file.get())
200 return false; 200 return false;
201 resource_ = extension()->GetResource(*details_->file); 201 resource_ = extension()->GetResource(*details_->file);
202 202
203 if (resource_.extension_root().empty() || resource_.relative_path().empty()) { 203 if (resource_.extension_root().empty() || resource_.relative_path().empty()) {
204 error_ = kNoCodeOrFileToExecuteError; 204 error_ = kNoCodeOrFileToExecuteError;
205 return false; 205 return false;
206 } 206 }
207 207
208 int resource_id; 208 int resource_id;
209 if (ExtensionsBrowserClient::Get() 209 ComponentExtensionResourceManager* component_extension_resource_manager =
210 ->GetComponentExtensionResourceManager() 210 ExtensionsBrowserClient::Get()->GetComponentExtensionResourceManager();
211 ->IsComponentExtensionResource(resource_.extension_root(), 211 if (component_extension_resource_manager &&
212 resource_.relative_path(), 212 component_extension_resource_manager->IsComponentExtensionResource(
213 &resource_id)) { 213 resource_.extension_root(),
214 resource_.relative_path(),
215 &resource_id)) {
214 const ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 216 const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
215 DidLoadFile(true, rb.GetRawDataResource(resource_id).as_string()); 217 DidLoadFile(true, rb.GetRawDataResource(resource_id).as_string());
216 } else { 218 } else {
217 scoped_refptr<FileReader> file_reader(new FileReader( 219 scoped_refptr<FileReader> file_reader(new FileReader(
218 resource_, base::Bind(&ExecuteCodeFunction::DidLoadFile, this))); 220 resource_, base::Bind(&ExecuteCodeFunction::DidLoadFile, this)));
219 file_reader->Start(); 221 file_reader->Start();
220 } 222 }
221 223
222 return true; 224 return true;
223 } 225 }
224 226
225 void ExecuteCodeFunction::OnExecuteCodeFinished(const std::string& error, 227 void ExecuteCodeFunction::OnExecuteCodeFinished(const std::string& error,
226 const GURL& on_url, 228 const GURL& on_url,
227 const base::ListValue& result) { 229 const base::ListValue& result) {
228 if (!error.empty()) 230 if (!error.empty())
229 SetError(error); 231 SetError(error);
230 232
231 SendResponse(error.empty()); 233 SendResponse(error.empty());
232 } 234 }
233 235
234 } // namespace extensions 236 } // namespace extensions
235 237
236 #endif // EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_ 238 #endif // EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698