Cleaning up capture_web_contents_function.

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 46 matching lines @@
 #include "components/translate/core/common/language_detection_details.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
-#include "extensions/browser/api/capture_web_contents_function_impl.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/extension_function_dispatcher.h"
 #include "extensions/browser/extension_function_util.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/file_reader.h"
 #include "extensions/browser/script_executor.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_constants.h"
@@ skipping 20 matching lines @@
 using content::WebContents;
 
 namespace extensions {
 
 namespace windows = api::windows;
 namespace keys = tabs_constants;
 namespace tabs = api::tabs;
 
 using core_api::extension_types::InjectDetails;
 
-template class CaptureWebContentsFunction<ChromeAsyncExtensionFunction>;
-
 namespace {
 
 bool GetBrowserFromWindowID(ChromeUIThreadExtensionFunction* function,
                             int window_id,
                             Browser** browser) {
   std::string error;
   Browser* result;
   result =
       ExtensionTabUtil::GetBrowserFromWindowID(function, window_id, &error);
   if (!result) {
     function->SetError(error);
     return false;
   }
 
   *browser = result;
   return true;
 }
 
+bool GetBrowserFromWindowID(ExtensionFunction* function,
+                            const ChromeExtensionFunctionDetails& details,
+                            int window_id,
+                            Browser** browser) {
+  std::string error;
+  Browser* result;
+  result = ExtensionTabUtil::GetBrowserFromWindowID(
+      function, details, window_id, &error);
+  if (!result) {
+    function->SetError(error);
+    return false;
+  }
+
+  *browser = result;
+  return true;
+}
+
 // |error_message| can optionally be passed in and will be set with an
 // appropriate message if the tab cannot be found by id.
 bool GetTabById(int tab_id,
                 Profile* profile,
                 bool include_incognito,
                 Browser** browser,
                 TabStripModel** tab_strip,
                 content::WebContents** contents,
                 int* tab_index,
                 std::string* error_message) {
@@ skipping 1353 matching lines @@
     return false;
   }
   // There's a chance that the tab is being dragged, or we're in some other
   // nested event loop. This code path ensures that the tab is safely closed
   // under such circumstances, whereas |TabStripModel::CloseWebContentsAt()|
   // does not.
   contents->Close();
   return true;
 }
 
+TabsCaptureVisibleTabFunction::TabsCaptureVisibleTabFunction()
+    : chrome_details_(this) {
+}
+
 bool TabsCaptureVisibleTabFunction::IsScreenshotEnabled() {
-  PrefService* service = GetProfile()->GetPrefs();
+  PrefService* service = chrome_details_.GetProfile()->GetPrefs();
   if (service->GetBoolean(prefs::kDisableScreenshots)) {
     error_ = keys::kScreenshotsDisabled;
     return false;
   }
   return true;
 }
 
 WebContents* TabsCaptureVisibleTabFunction::GetWebContentsForID(int window_id) {
   Browser* browser = NULL;
-  if (!GetBrowserFromWindowID(this, window_id, &browser))
+  if (!GetBrowserFromWindowID(this, chrome_details_, window_id, &browser))
     return NULL;
 
   WebContents* contents = browser->tab_strip_model()->GetActiveWebContents();
   if (!contents) {
     error_ = keys::kInternalVisibleTabCaptureError;
     return NULL;
   }
 
   if (!extension()->permissions_data()->CanCaptureVisiblePage(
           SessionTabHelper::IdForTab(contents), &error_)) {
@@ skipping 374 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