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

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

Issue 830833002: Makes GetComponentExtensionResourceManager() thread-safe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 11 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 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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 if (!details_->file.get()) 205 if (!details_->file.get())
206 return false; 206 return false;
207 resource_ = extension()->GetResource(*details_->file); 207 resource_ = extension()->GetResource(*details_->file);
208 208
209 if (resource_.extension_root().empty() || resource_.relative_path().empty()) { 209 if (resource_.extension_root().empty() || resource_.relative_path().empty()) {
210 error_ = kNoCodeOrFileToExecuteError; 210 error_ = kNoCodeOrFileToExecuteError;
211 return false; 211 return false;
212 } 212 }
213 213
214 int resource_id; 214 int resource_id;
215 ComponentExtensionResourceManager* component_extension_resource_manager = 215 const ComponentExtensionResourceManager*
216 ExtensionsBrowserClient::Get()->GetComponentExtensionResourceManager(); 216 component_extension_resource_manager =
217 ExtensionsBrowserClient::Get()
218 ->GetComponentExtensionResourceManager();
217 if (component_extension_resource_manager && 219 if (component_extension_resource_manager &&
218 component_extension_resource_manager->IsComponentExtensionResource( 220 component_extension_resource_manager->IsComponentExtensionResource(
219 resource_.extension_root(), 221 resource_.extension_root(),
220 resource_.relative_path(), 222 resource_.relative_path(),
221 &resource_id)) { 223 &resource_id)) {
222 const ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 224 const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
223 DidLoadFile(true, rb.GetRawDataResource(resource_id).as_string()); 225 DidLoadFile(true, rb.GetRawDataResource(resource_id).as_string());
224 } else { 226 } else {
225 scoped_refptr<FileReader> file_reader(new FileReader( 227 scoped_refptr<FileReader> file_reader(new FileReader(
226 resource_, base::Bind(&ExecuteCodeFunction::DidLoadFile, this))); 228 resource_, base::Bind(&ExecuteCodeFunction::DidLoadFile, this)));
227 file_reader->Start(); 229 file_reader->Start();
228 } 230 }
229 231
230 return true; 232 return true;
231 } 233 }
232 234
233 void ExecuteCodeFunction::OnExecuteCodeFinished(const std::string& error, 235 void ExecuteCodeFunction::OnExecuteCodeFinished(const std::string& error,
234 const GURL& on_url, 236 const GURL& on_url,
235 const base::ListValue& result) { 237 const base::ListValue& result) {
236 if (!error.empty()) 238 if (!error.empty())
237 SetError(error); 239 SetError(error);
238 240
239 SendResponse(error.empty()); 241 SendResponse(error.empty());
240 } 242 }
241 243
242 } // namespace extensions 244 } // namespace extensions
243 245
244 #endif // EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_ 246 #endif // EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698