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

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

Issue 334053003: Moves extension_icon_image and image_loader to extensions/browser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: include fail Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "chrome/browser/extensions/api/execute_code_function.h" 5 #include "chrome/browser/extensions/api/execute_code_function.h"
6 6
7 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" 7 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
8 #include "chrome/browser/extensions/image_loader.h"
9 #include "chrome/browser/extensions/script_executor.h" 8 #include "chrome/browser/extensions/script_executor.h"
10 #include "chrome/common/extensions/api/i18n/default_locale_handler.h" 9 #include "chrome/common/extensions/api/i18n/default_locale_handler.h"
10 #include "extensions/browser/component_extension_resource_manager.h"
11 #include "extensions/browser/extensions_browser_client.h"
11 #include "extensions/browser/file_reader.h" 12 #include "extensions/browser/file_reader.h"
12 #include "extensions/common/error_utils.h" 13 #include "extensions/common/error_utils.h"
13 #include "extensions/common/extension_messages.h" 14 #include "extensions/common/extension_messages.h"
14 #include "extensions/common/file_util.h" 15 #include "extensions/common/file_util.h"
15 #include "extensions/common/message_bundle.h" 16 #include "extensions/common/message_bundle.h"
16 #include "net/base/filename_util.h" 17 #include "net/base/filename_util.h"
17 #include "ui/base/resource/resource_bundle.h" 18 #include "ui/base/resource/resource_bundle.h"
18 19
19 namespace extensions { 20 namespace extensions {
20 21
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 if (!details_->file.get()) 190 if (!details_->file.get())
190 return false; 191 return false;
191 resource_ = GetExtension()->GetResource(*details_->file); 192 resource_ = GetExtension()->GetResource(*details_->file);
192 193
193 if (resource_.extension_root().empty() || resource_.relative_path().empty()) { 194 if (resource_.extension_root().empty() || resource_.relative_path().empty()) {
194 error_ = keys::kNoCodeOrFileToExecuteError; 195 error_ = keys::kNoCodeOrFileToExecuteError;
195 return false; 196 return false;
196 } 197 }
197 198
198 int resource_id; 199 int resource_id;
199 if (ImageLoader::IsComponentExtensionResource( 200 if (ExtensionsBrowserClient::Get()->GetComponentExtensionResourceManager()->
201 IsComponentExtensionResource(
200 resource_.extension_root(), resource_.relative_path(), 202 resource_.extension_root(), resource_.relative_path(),
201 &resource_id)) { 203 &resource_id)) {
202 const ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 204 const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
203 DidLoadFile(true, rb.GetRawDataResource(resource_id).as_string()); 205 DidLoadFile(true, rb.GetRawDataResource(resource_id).as_string());
204 } else { 206 } else {
205 scoped_refptr<FileReader> file_reader(new FileReader( 207 scoped_refptr<FileReader> file_reader(new FileReader(
206 resource_, base::Bind(&ExecuteCodeFunction::DidLoadFile, this))); 208 resource_, base::Bind(&ExecuteCodeFunction::DidLoadFile, this)));
207 file_reader->Start(); 209 file_reader->Start();
208 } 210 }
209 211
210 return true; 212 return true;
211 } 213 }
212 214
213 void ExecuteCodeFunction::OnExecuteCodeFinished( 215 void ExecuteCodeFunction::OnExecuteCodeFinished(
214 const std::string& error, 216 const std::string& error,
215 int32 on_page_id, 217 int32 on_page_id,
216 const GURL& on_url, 218 const GURL& on_url,
217 const base::ListValue& result) { 219 const base::ListValue& result) {
218 if (!error.empty()) 220 if (!error.empty())
219 SetError(error); 221 SetError(error);
220 222
221 SendResponse(error.empty()); 223 SendResponse(error.empty());
222 } 224 }
223 225
224 } // namespace extensions 226 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698