Fix webview.executeScript API

chrome/browser/extensions/api/webview/webview_api.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/webview/webview_api.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/browsing_data/browsing_data_api.h"
 #include "chrome/browser/extensions/api/context_menus/context_menus_api.h"
 #include "chrome/browser/extensions/api/context_menus/context_menus_api_helpers.h"
@@ skipping 245 matching lines @@
 bool WebviewExecuteCodeFunction::Init() {
   if (details_.get())
     return true;
 
   if (!args_->GetInteger(0, &guest_instance_id_))
     return false;
 
   if (!guest_instance_id_)
     return false;
 
+  std::string src;
+  if (!args_->GetString(1, &src))
+    return false;
+
+  guest_src_ = GURL(src);
+
+  if (guest_src_.is_empty())

[Fady Samuel, 2014/04/07 20:39:34]

if (guest_src_.is_empty() || guest_src_.invalid())

[not at google - send to devlin, 2014/04/07 20:43:18]

I think that empty implies invalid.

[Fady Samuel, 2014/04/07 20:44:12]

Perhaps then if (guest_src_.invalid())?

[not at google - send to devlin, 2014/04/07 21:00:07]

It would be

if (!guest_src_.is_valid())
  return false;

[Xi Han, 2014/04/07 21:03:37]

Done.

[Xi Han, 2014/04/07 21:03:37]

Done.

[Xi Han, 2014/04/07 21:03:37]

Done.

[Xi Han, 2014/04/07 21:03:37]

Done.

[Xi Han, 2014/04/07 21:03:37]

It makes sense to me, invalide() (actually !guest_src_.is_valid()) should
included the case of empty url.

On 2014/04/07 20:44:12, Fady Samuel wrote:

[Xi Han, 2014/04/07 21:09:44]

Thx for checking the real method name.

On 2014/04/07 21:00:07, kalman wrote:

+    return false;
+
   base::DictionaryValue* details_value = NULL;
-  if (!args_->GetDictionary(1, &details_value))
+  if (!args_->GetDictionary(2, &details_value))
     return false;
   scoped_ptr<InjectDetails> details(new InjectDetails());
   if (!InjectDetails::Populate(*details_value, details.get()))
     return false;
 
   details_ = details.Pass();
   return true;
 }
 
 bool WebviewExecuteCodeFunction::ShouldInsertCSS() const {
@@ skipping 10 matching lines @@
   if (!guest)
     return NULL;
 
   return guest->script_executor();
 }
 
 bool WebviewExecuteCodeFunction::IsWebView() const {
   return true;
 }
 
+GURL WebviewExecuteCodeFunction::GetWebViewSrc() const { return guest_src_; }
+
 WebviewExecuteScriptFunction::WebviewExecuteScriptFunction() {
 }
 
 void WebviewExecuteScriptFunction::OnExecuteCodeFinished(
     const std::string& error,
     int32 on_page_id,
     const GURL& on_url,
     const base::ListValue& result) {
   if (error.empty())
     SetResult(result.DeepCopy());
@@ skipping 220 matching lines @@
 
 WebviewTerminateFunction::~WebviewTerminateFunction() {
 }
 
 bool WebviewTerminateFunction::RunImplSafe(WebViewGuest* guest) {
   guest->Terminate();
   return true;
 }
 
 }  // namespace extensions