[DevTools] Migrate from AgentStateCallbacks to DevToolsAgentHostObserver.

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 <utility>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/extensions/extension_view_host_factory.h"
 #include "chrome/browser/ui/browser.h"
 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "chrome/common/url_constants.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/devtools_agent_host.h"
+#include "content/public/browser/devtools_agent_host_observer.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/notification_types.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/cocoa/window_size_constants.h"
 
 using content::BrowserContext;
 using content::RenderViewHost;
 using content::WebContents;
 using extensions::ExtensionViewHost;
@@ skipping 50 matching lines @@
   }
 
   void OnExtensionViewDidShow(ExtensionViewMac* view) override {
     [controller_ onViewDidShow];
   }
 
  private:
   ExtensionPopupController* controller_; // Weak; owns this.
 };
 
-class ExtensionPopupNotificationBridge : public content::NotificationObserver {
+class ExtensionPopupNotificationBridge :
+    public content::NotificationObserver,
+    public content::DevToolsAgentHostObserver {
  public:
   ExtensionPopupNotificationBridge(ExtensionPopupController* controller,
                                    ExtensionViewHost* view_host)
     : controller_(controller),
       view_host_(view_host),
-      web_contents_(view_host_->host_contents()),
-      devtools_callback_(base::Bind(
-          &ExtensionPopupNotificationBridge::OnDevToolsStateChanged,
-          base::Unretained(this))) {
-    content::DevToolsAgentHost::AddAgentStateCallback(devtools_callback_);
+      web_contents_(view_host_->host_contents()) {
+    content::DevToolsAgentHost::AddObserver(this);
   }
 
   ~ExtensionPopupNotificationBridge() override {
-    content::DevToolsAgentHost::RemoveAgentStateCallback(devtools_callback_);
+    content::DevToolsAgentHost::RemoveObserver(this);
   }
 
-  void OnDevToolsStateChanged(content::DevToolsAgentHost* agent_host,
-                              bool attached) {
+  void DevToolsAgentHostAttached(
+      content::DevToolsAgentHost* agent_host) override {
     if (agent_host->GetWebContents() != web_contents_)
       return;
+    // Set the flag on the controller so the popup is not hidden when
+    // the dev tools get focus.
+    [controller_ setBeingInspected:YES];
+  }
 
-    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
-                        afterDelay:0.0];
-    }
+  void DevToolsAgentHostDetached(
+      content::DevToolsAgentHost* agent_host) override {
+    if (agent_host->GetWebContents() != web_contents_)
+      return;
+    // Allow the devtools to finish detaching before we close the popup.
+    [controller_ performSelector:@selector(close)
+                      withObject:nil
+                      afterDelay:0.0];
   }
 
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override {
     switch (type) {
       case extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_FIRST_LOAD:
         if (content::Details<ExtensionViewHost>(view_host_) == details)
           [controller_ showDevTools];
         break;
@@ skipping 11 matching lines @@
 
  private:
   ExtensionPopupController* controller_;
 
   extensions::ExtensionViewHost* view_host_;
 
   // WebContents for controller. Hold onto this separately because we need to
   // know what it is for notifications, but our ExtensionViewHost may not be
   // valid.
   WebContents* web_contents_;
-  base::Callback<void(content::DevToolsAgentHost*, bool)> devtools_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionPopupNotificationBridge);
 };
 
 @implementation ExtensionPopupController
 
 @synthesize extensionId = extensionId_;
 
 - (id)initWithParentWindow:(NSWindow*)parentWindow
                 anchoredAt:(NSPoint)anchoredAt
@@ skipping 252 matching lines @@
   return minSize;
 }
 
 // Private (TestingAPI)
 + (NSSize)maxPopupSize {
   NSSize maxSize = {ExtensionViewMac::kMaxWidth, ExtensionViewMac::kMaxHeight};
   return maxSize;
 }
 
 @end