Move keyboard related methods from RenderViewHostDelegate to a new RenderWidgetHostDelegate

content/browser/web_contents/interstitial_page_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_WEB_CONTENTS_INTERSTITIAL_PAGE_IMPL_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_INTERSTITIAL_PAGE_IMPL_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process_util.h"
+#include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/render_view_host_delegate.h"
 #include "content/public/common/renderer_preferences.h"
 #include "googleurl/src/gurl.h"
 
 class WebContentsImpl;
 
 namespace content {
 class NavigationEntry;
 class RenderViewHostImpl;
 class WebContentsView;
 }
 
 enum ResourceRequestAction {
   BLOCK,
   RESUME,
   CANCEL
 };
 
 class CONTENT_EXPORT InterstitialPageImpl
     : public NON_EXPORTED_BASE(content::InterstitialPage),
       public content::NotificationObserver,
-      public content::RenderViewHostDelegate {
+      public content::RenderViewHostDelegate,
+      public content::RenderWidgetHostDelegate {
  public:
   // The different state of actions the user can take in an interstitial.
   enum ActionState {
     NO_ACTION,           // No action has been taken yet.
     PROCEED_ACTION,      // "Proceed" was selected.
     DONT_PROCEED_ACTION  // "Don't proceed" was selected.
   };
 
   InterstitialPageImpl(content::WebContents* web_contents,
                        bool new_navigation,
@@ skipping 42 matching lines @@
   virtual void DidNavigate(
       content::RenderViewHost* render_view_host,
       const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE;
   virtual void UpdateTitle(content::RenderViewHost* render_view_host,
                            int32 page_id,
                            const string16& title,
                            base::i18n::TextDirection title_direction) OVERRIDE;
   virtual content::RendererPreferences GetRendererPrefs(
       content::BrowserContext* browser_context) const OVERRIDE;
   virtual webkit_glue::WebPreferences GetWebkitPrefs() OVERRIDE;
+  virtual content::ViewType GetRenderViewType() const OVERRIDE;
+  virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
+
+  // RenderWidgetHostDelegate implementation:
   virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                                       bool* is_keyboard_shortcut) OVERRIDE;
   virtual void HandleKeyboardEvent(
       const NativeWebKeyboardEvent& event) OVERRIDE;
-  virtual content::ViewType GetRenderViewType() const OVERRIDE;
-  virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
 
   bool enabled() const { return enabled_; }
   content::WebContents* web_contents() const;
   const GURL& url() const { return url_; }
 
   // Creates the RenderViewHost containing the interstitial content.
   // Overriden in unit tests.
   virtual content::RenderViewHost* CreateRenderViewHost();
 
   // Creates the WebContentsView that shows the interstitial RVH.
@@ skipping 74 matching lines @@
   mutable content::RendererPreferences renderer_preferences_;
 
   bool create_view_;
 
   scoped_ptr<content::InterstitialPageDelegate> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl);
 };
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_INTERSTITIAL_PAGE_IMPL_H_