[Extensions] Reuse ChromeExtensionFunctionDetails

chrome/browser/extensions/chrome_extension_function_details.cc

 // Copyright 2014 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/chrome_extension_function_details.h"
 
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/extensions/window_controller_list.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 38 matching lines @@
     }
   }
 
   // Otherwise, try to default to a reasonable browser. If |include_incognito_|
   // is true, we will also search browsers in the incognito version of this
   // profile. Note that the profile may already be incognito, in which case
   // we will search the incognito version only, regardless of the value of
   // |include_incognito|. Look only for browsers on the active desktop as it is
   // preferable to pretend no browser is open then to return a browser on
   // another desktop.
-  if (function_->render_frame_host()) {
-    Profile* profile = Profile::FromBrowserContext(
-        function_->render_frame_host()->GetProcess()->GetBrowserContext());
-    Browser* browser =
-        chrome::FindAnyBrowser(profile, function_->include_incognito());
-    if (browser)
-      return browser;
-  }
+  content::WebContents* web_contents = function_->GetSenderWebContents();
+  Profile* profile = Profile::FromBrowserContext(
+      web_contents ? web_contents->GetBrowserContext()
+                   : function_->browser_context());
+  Browser* browser =
+      chrome::FindAnyBrowser(profile, function_->include_incognito());
+  if (browser)
+    return browser;
 
   // NOTE(rafaelw): This can return NULL in some circumstances. In particular,
   // a background_page onload chrome.tabs api call can make it into here
   // before the browser is sufficiently initialized to return here, or
   // all of this profile's browser windows may have been closed.
   // A similar situation may arise during shutdown.
   // TODO(rafaelw): Delay creation of background_page until the browser
   // is available. http://code.google.com/p/chromium/issues/detail?id=13284
   return NULL;
 }
 
 extensions::WindowController*
 ChromeExtensionFunctionDetails::GetExtensionWindowController() const {
   // If the delegate has an associated window controller, return it.
   if (function_->dispatcher()) {
     extensions::WindowController* window_controller =
         function_->dispatcher()->GetExtensionWindowController();
     if (window_controller)
       return window_controller;
   }
 
   return extensions::WindowControllerList::GetInstance()
       ->CurrentWindowForFunction(function_);
 }
 
 content::WebContents*
 ChromeExtensionFunctionDetails::GetAssociatedWebContents() {
-  content::WebContents* web_contents = function_->GetAssociatedWebContents();
-  if (web_contents)
-    return web_contents;
+  if (function_->dispatcher()) {

[lazyboy, 2016/08/31 20:48:24]

Feels a bit odd that function::GetAssocWC goes from
function->details->function... oh well.

[Devlin, 2016/08/31 20:56:39]

Agreed - but it seems better than having 100% duplicated code, IMO.

[lazyboy, 2016/08/31 21:21:42]

Acknowledged.

+    content::WebContents* web_contents =
+        function_->dispatcher()->GetAssociatedWebContents();
+    if (web_contents)
+      return web_contents;
+  }
 
   Browser* browser = GetCurrentBrowser();
   if (!browser)
     return NULL;
   return browser->tab_strip_model()->GetActiveWebContents();
 }
 
 content::WebContents* ChromeExtensionFunctionDetails::GetOriginWebContents() {
   WebContents* contents = function_->GetSenderWebContents();
   if (!contents)
@@ skipping 44 matching lines @@
     return controller->window()->GetNativeWindow();
 
   // CurrentWindowForFunction() can't find app's window.
   WebContents* contents = GetOriginWebContents();
   if (contents)
     return contents->GetTopLevelNativeWindow();
 
   Browser* browser = chrome::FindBrowserWithProfile(GetProfile());
   return browser->window()->GetNativeWindow();
 }