| Index: content/shell/browser/shell_web_contents_view_delegate.h
|
| diff --git a/content/shell/browser/shell_web_contents_view_delegate.h b/content/shell/browser/shell_web_contents_view_delegate.h
|
| index 7233e13a6cfb1c9b97d9c767d690cbdbd259d3fb..6181864234a1bc8b014d01172ff8ab78f6296ef2 100644
|
| --- a/content/shell/browser/shell_web_contents_view_delegate.h
|
| +++ b/content/shell/browser/shell_web_contents_view_delegate.h
|
| @@ -9,11 +9,6 @@
|
| #include "content/public/browser/web_contents_view_delegate.h"
|
| #include "content/public/common/context_menu_params.h"
|
|
|
| -#if defined(TOOLKIT_GTK)
|
| -#include "ui/base/gtk/gtk_signal.h"
|
| -#include "ui/base/gtk/owned_widget_gtk.h"
|
| -#endif
|
| -
|
| namespace content {
|
|
|
| class ShellWebContentsViewDelegate : public WebContentsViewDelegate {
|
| @@ -26,15 +21,7 @@ class ShellWebContentsViewDelegate : public WebContentsViewDelegate {
|
| const ContextMenuParams& params) OVERRIDE;
|
| virtual WebDragDestDelegate* GetDragDestDelegate() OVERRIDE;
|
|
|
| -#if defined(TOOLKIT_GTK)
|
| - virtual void Initialize(GtkWidget* expanded_container,
|
| - ui::FocusStoreGtk* focus_store) OVERRIDE;
|
| - virtual gfx::NativeView GetNativeView() const OVERRIDE;
|
| - virtual void Focus() OVERRIDE;
|
| - virtual gboolean OnNativeViewFocusEvent(GtkWidget* widget,
|
| - GtkDirectionType type,
|
| - gboolean* return_value) OVERRIDE;
|
| -#elif defined(OS_MACOSX)
|
| +#if defined(OS_MACOSX)
|
| virtual NSObject<RenderWidgetHostViewMacDelegate>*
|
| CreateRenderWidgetHostViewDelegate(
|
| RenderWidgetHost* render_widget_host) OVERRIDE;
|
| @@ -52,30 +39,6 @@ class ShellWebContentsViewDelegate : public WebContentsViewDelegate {
|
| WebContents* web_contents_;
|
| ContextMenuParams params_;
|
|
|
| -#if defined(TOOLKIT_GTK)
|
| - ui::OwnedWidgetGtk floating_;
|
| - GtkWidget* expanded_container_;
|
| -
|
| - CHROMEGTK_CALLBACK_0(ShellWebContentsViewDelegate, void,
|
| - OnBackMenuActivated);
|
| - CHROMEGTK_CALLBACK_0(ShellWebContentsViewDelegate, void,
|
| - OnForwardMenuActivated);
|
| - CHROMEGTK_CALLBACK_0(ShellWebContentsViewDelegate, void,
|
| - OnReloadMenuActivated);
|
| - CHROMEGTK_CALLBACK_0(ShellWebContentsViewDelegate, void,
|
| - OnOpenURLMenuActivated);
|
| - CHROMEGTK_CALLBACK_0(ShellWebContentsViewDelegate, void,
|
| - OnCutMenuActivated);
|
| - CHROMEGTK_CALLBACK_0(ShellWebContentsViewDelegate, void,
|
| - OnCopyMenuActivated);
|
| - CHROMEGTK_CALLBACK_0(ShellWebContentsViewDelegate, void,
|
| - OnPasteMenuActivated);
|
| - CHROMEGTK_CALLBACK_0(ShellWebContentsViewDelegate, void,
|
| - OnDeleteMenuActivated);
|
| - CHROMEGTK_CALLBACK_0(ShellWebContentsViewDelegate, void,
|
| - OnInspectMenuActivated);
|
| -#endif
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(ShellWebContentsViewDelegate);
|
| };
|
|
|
|
|