FindBrowserWithWebContents now recognises DevTool's embedded WebContent

chrome/browser/ui/browser_finder.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/ui/browser_finder.h"
 
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/navigation_controller.h"
 
 using content::WebContents;
 
@@ skipping 141 matching lines @@
   if (!window)
     return NULL;
   for (BrowserIterator it; !it.done(); it.Next()) {
     Browser* browser = *it;
     if (browser->window() && browser->window()->GetNativeWindow() == window)
       return browser;
   }
   return NULL;
 }
 
 Browser* FindBrowserWithWebContents(const WebContents* web_contents) {

[pfeldman, 2013/08/29 11:57:36]

This method is used in many places that do various operations on the browser
returned. It used to return NULL for devtools, but now this is being changed. I
wonder if you could move this to the specific call site in order to minimize the
impact of this change.

[vabr (Chromium), 2013/08/29 12:51:09]

That's a good point, I was also a bit scared, although the tests passed.

As a bonus, one less file to modify, and freeing pkasting from the burden of
this review. :)

   DCHECK(web_contents);
   for (TabContentsIterator it; !it.done(); it.Next()) {
     if (*it == web_contents)
       return it.browser();
+    DevToolsWindow* dev_tools_window =
+        DevToolsWindow::GetDockedInstanceForInspectedTab(*it);
+    if (dev_tools_window && (dev_tools_window->web_contents() == web_contents))
+      return it.browser();
   }
   return NULL;
 }
 
 Browser* FindLastActiveWithProfile(Profile* profile, HostDesktopType type) {
   BrowserList* list = BrowserList::GetInstance(type);
   // We are only interested in last active browsers, so we don't fall back to
   // all browsers like FindBrowserWith* do.
   return FindBrowserMatching(list->begin_last_active(), list->end_last_active(),
                              profile, Browser::FEATURE_NONE, kMatchAny);
@@ skipping 26 matching lines @@
 
 size_t GetBrowserCount(Profile* profile, HostDesktopType type) {
   return GetBrowserCountImpl(profile, type, kMatchAny);
 }
 
 size_t GetTabbedBrowserCount(Profile* profile, HostDesktopType type) {
   return GetBrowserCountImpl(profile, type, kMatchTabbed);
 }
 
 }  // namespace chrome