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

Side by Side Diff: chrome/renderer/extensions/webstore_bindings.cc

Issue 481433005: Extensions: Move id_util functions to crx_file component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert last patchset. function returns Extension* and can't use an assert. Created 6 years, 4 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
« no previous file with comments | « chrome/renderer/DEPS ('k') | chrome/renderer/searchbox/searchbox_extension.cc » ('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 "chrome/renderer/extensions/webstore_bindings.h" 5 #include "chrome/renderer/extensions/webstore_bindings.h"
6 6
7 #include "base/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "chrome/common/extensions/api/webstore/webstore_api_constants.h" 8 #include "chrome/common/extensions/api/webstore/webstore_api_constants.h"
9 #include "chrome/common/extensions/chrome_extension_messages.h" 9 #include "chrome/common/extensions/chrome_extension_messages.h"
10 #include "chrome/common/extensions/extension_constants.h" 10 #include "chrome/common/extensions/extension_constants.h"
11 #include "components/crx_file/id_util.h"
11 #include "content/public/renderer/render_view.h" 12 #include "content/public/renderer/render_view.h"
12 #include "extensions/common/extension.h" 13 #include "extensions/common/extension.h"
13 #include "extensions/renderer/script_context.h" 14 #include "extensions/renderer/script_context.h"
14 #include "third_party/WebKit/public/web/WebDocument.h" 15 #include "third_party/WebKit/public/web/WebDocument.h"
15 #include "third_party/WebKit/public/web/WebElement.h" 16 #include "third_party/WebKit/public/web/WebElement.h"
16 #include "third_party/WebKit/public/web/WebNode.h" 17 #include "third_party/WebKit/public/web/WebNode.h"
17 #include "third_party/WebKit/public/web/WebNodeList.h" 18 #include "third_party/WebKit/public/web/WebNodeList.h"
18 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" 19 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
19 #include "url/gurl.h" 20 #include "url/gurl.h"
20 #include "v8/include/v8.h" 21 #include "v8/include/v8.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 if (webstore_url.scheme() != webstore_base_url.scheme() || 159 if (webstore_url.scheme() != webstore_base_url.scheme() ||
159 webstore_url.host() != webstore_base_url.host() || 160 webstore_url.host() != webstore_base_url.host() ||
160 !StartsWithASCII( 161 !StartsWithASCII(
161 webstore_url.path(), webstore_base_url.path(), true)) { 162 webstore_url.path(), webstore_base_url.path(), true)) {
162 *error = kInvalidWebstoreItemUrlError; 163 *error = kInvalidWebstoreItemUrlError;
163 return false; 164 return false;
164 } 165 }
165 166
166 std::string candidate_webstore_item_id = webstore_url.path().substr( 167 std::string candidate_webstore_item_id = webstore_url.path().substr(
167 webstore_base_url.path().length()); 168 webstore_base_url.path().length());
168 if (!extensions::Extension::IdIsValid(candidate_webstore_item_id)) { 169 if (!crx_file::id_util::IdIsValid(candidate_webstore_item_id)) {
169 *error = kInvalidWebstoreItemUrlError; 170 *error = kInvalidWebstoreItemUrlError;
170 return false; 171 return false;
171 } 172 }
172 173
173 std::string reconstructed_webstore_item_url_string = 174 std::string reconstructed_webstore_item_url_string =
174 extension_urls::GetWebstoreItemDetailURLPrefix() + 175 extension_urls::GetWebstoreItemDetailURLPrefix() +
175 candidate_webstore_item_id; 176 candidate_webstore_item_id;
176 if (reconstructed_webstore_item_url_string != webstore_url_string) { 177 if (reconstructed_webstore_item_url_string != webstore_url_string) {
177 *error = kInvalidWebstoreItemUrlError; 178 *error = kInvalidWebstoreItemUrlError;
178 return false; 179 return false;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 v8::Isolate* isolate = context()->isolate(); 244 v8::Isolate* isolate = context()->isolate();
244 v8::HandleScope handle_scope(isolate); 245 v8::HandleScope handle_scope(isolate);
245 v8::Context::Scope context_scope(context()->v8_context()); 246 v8::Context::Scope context_scope(context()->v8_context());
246 v8::Handle<v8::Value> argv[] = { 247 v8::Handle<v8::Value> argv[] = {
247 v8::Number::New(isolate, percent_downloaded / 100.0)}; 248 v8::Number::New(isolate, percent_downloaded / 100.0)};
248 context()->module_system()->CallModuleMethod( 249 context()->module_system()->CallModuleMethod(
249 "webstore", "onDownloadProgress", arraysize(argv), argv); 250 "webstore", "onDownloadProgress", arraysize(argv), argv);
250 } 251 }
251 252
252 } // namespace extensions 253 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/renderer/DEPS ('k') | chrome/renderer/searchbox/searchbox_extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698