BrowserPluginGuest is no longer a WebContentsDelegate

chrome/browser/guest_view/guest_view_base.h

 // 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.
 
 #ifndef CHROME_BROWSER_GUEST_VIEW_GUEST_VIEW_BASE_H_
 #define CHROME_BROWSER_GUEST_VIEW_GUEST_VIEW_BASE_H_
 
 #include <queue>
 
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "content/public/browser/browser_plugin_guest_delegate.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_delegate.h"
 
 struct RendererContentSettingRules;
 
 // A GuestViewBase is the base class browser-side API implementation for a
 // <*view> tag. GuestViewBase maintains an association between a guest
 // WebContents and an embedder WebContents. It receives events issued from
 // the guest and relays them to the embedder.
-class GuestViewBase : public content::BrowserPluginGuestDelegate {
+class GuestViewBase : public content::BrowserPluginGuestDelegate,
+                      public content::WebContentsDelegate {
  public:
   class Event {
    public:
     Event(const std::string& name, scoped_ptr<base::DictionaryValue> args);
     ~Event();
 
     const std::string& name() const { return name_; }
 
     scoped_ptr<base::DictionaryValue> GetArguments();
 
@@ skipping 84 matching lines @@
 
   // Returns the embedder's process ID.
   int embedder_render_process_id() const { return embedder_render_process_id_; }
 
   GuestViewBase* GetOpener() const {
     return opener_.get();
   }
 
   void SetOpener(GuestViewBase* opener);
 
+  // WebContentsDelegate implementation.
+  virtual bool ShouldFocusPageAfterCrash() OVERRIDE;
+  virtual bool PreHandleGestureEvent(
+      content::WebContents* source,
+      const blink::WebGestureEvent& event) OVERRIDE;
+
   // BrowserPluginGuestDelegate implementation.
   virtual void Destroy() OVERRIDE;
   virtual void RegisterDestructionCallback(
       const DestructionCallback& callback) OVERRIDE;
-  virtual bool PreHandleGestureEvent(
-      content::WebContents* source,
-      const blink::WebGestureEvent& event) OVERRIDE;
-
  protected:
   GuestViewBase(int guest_instance_id,
                 content::WebContents* guest_web_contents,
                 const std::string& embedder_extension_id);
   virtual ~GuestViewBase();
 
   // Dispatches an event |event_name| to the embedder with the |event| fields.
   void DispatchEvent(Event* event);
 
  private:
@@ skipping 27 matching lines @@
   scoped_ptr<base::DictionaryValue> extra_params_;
 
   // This is used to ensure pending tasks will not fire after this object is
   // destroyed.
   base::WeakPtrFactory<GuestViewBase> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GuestViewBase);
 };
 
 #endif  // CHROME_BROWSER_GUEST_VIEW_GUEST_VIEW_BASE_H_