DevTools: migrate DevTools APIs to use WebContents instead of RenderViewHost.

chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 
 #include <algorithm>
 
 #include "base/callback.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 10 matching lines @@
 #include "components/web_modal/popup_manager.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_manager.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/base/cocoa/window_size_constants.h"
 
 using content::BrowserContext;
 using content::RenderViewHost;
+using content::WebContents;
 
 namespace {
 // The duration for any animations that might be invoked by this controller.
 const NSTimeInterval kAnimationDuration = 0.2;
 
 // There should only be one extension popup showing at one time. Keep a
 // reference to it here.
 static ExtensionPopupController* gPopup;
 
 // Given a value and a rage, clamp the value into the range.
@@ skipping 44 matching lines @@
   }
 
  private:
   ExtensionPopupController* controller_; // Weak; owns this.
 };
 
 class DevtoolsNotificationBridge : public content::NotificationObserver {
  public:
   explicit DevtoolsNotificationBridge(ExtensionPopupController* controller)
     : controller_(controller),
-      render_view_host_([controller_ extensionViewHost]->render_view_host()),
+      web_contents_([controller_ extensionViewHost]->host_contents()),
       devtools_callback_(base::Bind(
           &DevtoolsNotificationBridge::OnDevToolsStateChanged,
           base::Unretained(this))) {
     content::DevToolsManager::GetInstance()->AddAgentStateCallback(
         devtools_callback_);
   }
 
   virtual ~DevtoolsNotificationBridge() {
     content::DevToolsManager::GetInstance()->RemoveAgentStateCallback(
         devtools_callback_);
   }
 
   void OnDevToolsStateChanged(content::DevToolsAgentHost* agent_host,
                               bool attached) {
-    if (agent_host->GetRenderViewHost() != render_view_host_)
+    if (agent_host->GetWebContents() != web_contents_)
       return;
 
     if (attached) {
       // Set the flag on the controller so the popup is not hidden when
       // the dev tools get focus.
       [controller_ setBeingInspected:YES];
     } else {
       // Allow the devtools to finish detaching before we close the popup.
       [controller_ performSelector:@selector(close)
                         withObject:nil
@@ skipping 15 matching lines @@
       }
       default: {
         NOTREACHED() << "Received unexpected notification";
         break;
       }
     };
   }
 
  private:
   ExtensionPopupController* controller_;
-  // RenderViewHost for controller. Hold onto this separately because we need to
+  // WebContents for controller. Hold onto this separately because we need to
   // know what it is for notifications, but our ExtensionViewHost may not be
   // valid.
-  RenderViewHost* render_view_host_;
+  WebContents* web_contents_;
   base::Callback<void(content::DevToolsAgentHost*, bool)> devtools_callback_;
 };
 
 @implementation ExtensionPopupController
 
 - (id)initWithHost:(extensions::ExtensionViewHost*)host
       parentWindow:(NSWindow*)parentWindow
         anchoredAt:(NSPoint)anchoredAt
      arrowLocation:(info_bubble::BubbleArrowLocation)arrowLocation
            devMode:(BOOL)devMode {
@@ skipping 41 matching lines @@
   }
   return self;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
 - (void)showDevTools {
-  DevToolsWindow::OpenDevToolsWindow(host_->render_view_host());
+  DevToolsWindow::OpenDevToolsWindow(host_->host_contents());
 }
 
 - (void)close {
   // |windowWillClose:| could have already been called. http://crbug.com/279505
   if (host_) {
     // TODO(gbillock): Change this API to say directly if the current popup
     // should block tab close? This is a bit over-reaching.
     web_modal::PopupManager* popup_manager =
         web_modal::PopupManager::FromWebContents(host_->host_contents());
     if (popup_manager && popup_manager->IsWebModalDialogActive(
@@ skipping 209 matching lines @@
   return minSize;
 }
 
 // Private (TestingAPI)
 + (NSSize)maxPopupSize {
   NSSize maxSize = {ExtensionViewMac::kMaxWidth, ExtensionViewMac::kMaxHeight};
   return maxSize;
 }
 
 @end