Add ChromeExtensionFunctionDetails

chrome/browser/extensions/api/tabs/tabs_api.cc

 // Copyright (c) 2012 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/tabs/tabs_api.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 1615 matching lines @@
 }
 
 void TabsDetectLanguageFunction::GotLanguage(const std::string& language) {
   SetResult(new base::StringValue(language.c_str()));
   SendResponse(true);
 
   Release();  // Balanced in Run()
 }
 
 ExecuteCodeInTabFunction::ExecuteCodeInTabFunction()
-    : execute_tab_id_(-1) {
+    : chrome_details_(this), execute_tab_id_(-1) {
 }
 
 ExecuteCodeInTabFunction::~ExecuteCodeInTabFunction() {}
 
 bool ExecuteCodeInTabFunction::HasPermission() {
   if (Init() &&
       extension_->permissions_data()->HasAPIPermissionForTab(
           execute_tab_id_, APIPermission::kTab)) {
     return true;
   }
   return ExtensionFunction::HasPermission();
 }
 
 bool ExecuteCodeInTabFunction::CanExecuteScriptOnPage() {
   content::WebContents* contents = NULL;
 
   // If |tab_id| is specified, look for the tab. Otherwise default to selected
   // tab in the current window.
   CHECK_GE(execute_tab_id_, 0);
   if (!GetTabById(execute_tab_id_,
-                  GetProfile(),
+                  chrome_details_.GetProfile(),
                   include_incognito(),
                   NULL,
                   NULL,
                   &contents,
                   NULL,
                   &error_)) {
     return false;
   }
 
   CHECK(contents);
@@ skipping 12 matching lines @@
   }
 
   return true;
 }
 
 ScriptExecutor* ExecuteCodeInTabFunction::GetScriptExecutor() {
   Browser* browser = NULL;
   content::WebContents* contents = NULL;
 
   bool success = GetTabById(execute_tab_id_,
-                            GetProfile(),
+                            chrome_details_.GetProfile(),
                             include_incognito(),
                             &browser,
                             NULL,
                             &contents,
                             NULL,
                             &error_) &&
                  contents && browser;
 
   if (!success)
     return NULL;
 
   return TabHelper::FromWebContents(contents)->script_executor();
 }
 
 bool ExecuteCodeInTabFunction::IsWebView() const {
   return false;
 }
 
 const GURL& ExecuteCodeInTabFunction::GetWebViewSrc() const {
   return GURL::EmptyGURL();
 }
 
-bool TabsExecuteScriptFunction::ShouldInsertCSS() const {
-  return false;
-}
-
-void TabsExecuteScriptFunction::OnExecuteCodeFinished(
-    const std::string& error,
-    const GURL& on_url,
-    const base::ListValue& result) {
-  if (error.empty())
-    SetResult(result.DeepCopy());
-  ExecuteCodeInTabFunction::OnExecuteCodeFinished(error, on_url, result);
-}
-
 bool ExecuteCodeInTabFunction::Init() {

[scheib, 2014/09/05 03:17:22]

Thanks for fixing other member's order to match declaration. Consider moving
Init() as well since you're here.

[Ken Rockot(use gerrit already), 2014/09/05 16:47:39]

Done.

   if (details_.get())
     return true;
 
   // |tab_id| is optional so it's ok if it's not there.
   int tab_id = -1;
   if (args_->GetInteger(0, &tab_id))
     EXTENSION_FUNCTION_VALIDATE(tab_id >= 0);
 
   // |details| are not optional.
   base::DictionaryValue* details_value = NULL;
   if (!args_->GetDictionary(1, &details_value))
     return false;
   scoped_ptr<InjectDetails> details(new InjectDetails());
   if (!InjectDetails::Populate(*details_value, details.get()))
     return false;
 
   // If the tab ID wasn't given then it needs to be converted to the
   // currently active tab's ID.
   if (tab_id == -1) {
-    Browser* browser = GetCurrentBrowser();
+    Browser* browser = chrome_details_.GetCurrentBrowser();
     if (!browser)
       return false;
     content::WebContents* web_contents = NULL;
     if (!ExtensionTabUtil::GetDefaultTab(browser, &web_contents, &tab_id))
       return false;
   }
 
   execute_tab_id_ = tab_id;
   details_ = details.Pass();
   return true;
 }
 
+bool TabsExecuteScriptFunction::ShouldInsertCSS() const {
+  return false;
+}
+
+void TabsExecuteScriptFunction::OnExecuteCodeFinished(
+    const std::string& error,
+    const GURL& on_url,
+    const base::ListValue& result) {
+  if (error.empty())
+    SetResult(result.DeepCopy());
+  ExecuteCodeInTabFunction::OnExecuteCodeFinished(error, on_url, result);
+}
+
 bool TabsInsertCSSFunction::ShouldInsertCSS() const {
   return true;
 }
 
 content::WebContents* ZoomAPIFunction::GetWebContents(int tab_id) {
   content::WebContents* web_contents = NULL;
   if (tab_id != -1) {
     // We assume this call leaves web_contents unchanged if it is unsuccessful.
     GetTabById(tab_id,
                GetProfile(),
@@ skipping 126 matching lines @@
   ZoomController::ZoomMode zoom_mode = zoom_controller->zoom_mode();
   api::tabs::ZoomSettings zoom_settings;
   ZoomModeToZoomSettings(zoom_mode, &zoom_settings);
 
   results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings);
   SendResponse(true);
   return true;
 }
 
 }  // namespace extensions