Track all extension frames in ProcessManager, inspect extensionoptions

chrome/browser/extensions/api/developer_private/inspectable_views_finder.cc

 // Copyright 2015 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/developer_private/inspectable_views_finder.h"
 
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/developer_private.h"
 #include "content/public/browser/render_frame_host.h"
@@ skipping 42 matching lines @@
       break;
     case VIEW_TYPE_BACKGROUND_CONTENTS:
       view->type = api::developer_private::VIEW_TYPE_BACKGROUND_CONTENTS;
       break;
     case VIEW_TYPE_EXTENSION_BACKGROUND_PAGE:
       view->type = api::developer_private::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE;
       break;
     case VIEW_TYPE_EXTENSION_DIALOG:
       view->type = api::developer_private::VIEW_TYPE_EXTENSION_DIALOG;
       break;
+    case VIEW_TYPE_EXTENSION_GUEST:
+      view->type = api::developer_private::VIEW_TYPE_EXTENSION_GUEST;
+      break;
     case VIEW_TYPE_EXTENSION_POPUP:
       view->type = api::developer_private::VIEW_TYPE_EXTENSION_POPUP;
       break;
     case VIEW_TYPE_LAUNCHER_PAGE:
       view->type = api::developer_private::VIEW_TYPE_LAUNCHER_PAGE;
       break;
     case VIEW_TYPE_PANEL:
       view->type = api::developer_private::VIEW_TYPE_PANEL;
       break;
     case VIEW_TYPE_TAB_CONTENTS:
@@ skipping 69 matching lines @@
     ProcessManager* process_manager,
     bool is_incognito,
     ViewList* result) {
   const std::set<content::RenderFrameHost*>& hosts =
       process_manager->GetRenderFrameHostsForExtension(extension.id());
   for (content::RenderFrameHost* host : hosts) {
     content::WebContents* web_contents =
         content::WebContents::FromRenderFrameHost(host);
     ViewType host_type = GetViewType(web_contents);
     if (host_type == VIEW_TYPE_EXTENSION_POPUP ||
-        host_type == VIEW_TYPE_EXTENSION_DIALOG) {
+        host_type == VIEW_TYPE_EXTENSION_DIALOG ||
+        host_type == VIEW_TYPE_APP_WINDOW) {

[Devlin, 2015/12/01 21:40:49]

Why don't we want to include APP_WINDOW here?  This is for inspectable views, so
I think they should show up, right?

[robwu, 2015/12/01 23:19:57]

App windows are already dealt with by GetAppWindowViewsForExtension, see
https://chromium.googlesource.com/chromium/src/+/36bdeb3fb8984da7875aa970ba9f...

Without the above check, the assert at line 57 in
DeveloperPrivateApiTest.InspectAppWindowView fails because the app window is
reported twice
(https://chromium.googlesource.com/chromium/src/+/e7057530af5dbb422f1de1c72785...).

[Devlin, 2015/12/01 23:29:58]

Ah, of course.

       continue;
     }
 
     GURL url = web_contents->GetURL();
     // If this is a background page that just opened, there might not be a
     // committed (or visible) url yet. In this case, use the initial url.
     if (url.is_empty()) {
       ExtensionHost* extension_host =
           process_manager->GetExtensionHostForRenderFrameHost(host);
       if (extension_host)
@@ skipping 27 matching lines @@
       url = window->initial_url();
 
     content::RenderProcessHost* process = web_contents->GetRenderProcessHost();
     result->push_back(ConstructView(
         url, process->GetID(), web_contents->GetMainFrame()->GetRoutingID(),
         false, false, GetViewType(web_contents)));
   }
 }
 
 }  // namespace extensions