Cleaning up capture_web_contents_function.

chrome/browser/extensions/extension_tab_util.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/extension_tab_util.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
+#include "chrome/browser/extensions/chrome_extension_function_details.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/extensions/window_controller_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
@@ skipping 249 matching lines @@
     }
     return result;
   } else {
     return GetBrowserInProfileWithId(function->GetProfile(),
                                      window_id,
                                      function->include_incognito(),
                                      error);
   }
 }
 
+Browser* ExtensionTabUtil::GetBrowserFromWindowID(
+    const ChromeExtensionFunctionDetails& details,
+    int window_id,
+    std::string* error) {
+  if (window_id == extension_misc::kCurrentWindowId) {
+    Browser* result = details.GetCurrentBrowser();
+    if (!result || !result->window()) {
+      if (error)
+        *error = keys::kNoCurrentWindowError;
+      return NULL;
+    }
+    return result;
+  } else {
+    return GetBrowserInProfileWithId(details.GetProfile(),
+                                     window_id,
+                                     details.function()->include_incognito(),
+                                     error);
+  }
+}
+
 int ExtensionTabUtil::GetWindowId(const Browser* browser) {
   return browser->session_id().id();
 }
 
 int ExtensionTabUtil::GetWindowIdOfTabStripModel(
     const TabStripModel* tab_strip_model) {
   for (chrome::BrowserIterator it; !it.done(); it.Next()) {
     if (it->tab_strip_model() == tab_strip_model)
       return GetWindowId(*it);
   }
@@ skipping 302 matching lines @@
                                   false);
     browser->OpenURL(params);
     browser->window()->Show();
     WebContents* web_contents =
         browser->tab_strip_model()->GetActiveWebContents();
     web_contents->GetDelegate()->ActivateContents(web_contents);
   }
 }
 
 }  // namespace extensions