Index: content/shell/browser/shell.h |
diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h |
index 4acffff46eabad7d207214a1c6908e385f605b65..8125262f9a918cedfd132bea375a14ea0831ef66 100644 |
--- a/content/shell/browser/shell.h |
+++ b/content/shell/browser/shell.h |
@@ -212,24 +212,6 @@ class Shell : public WebContentsDelegate, |
void InnerShowDevTools(const std::string& settings); |
void OnDevToolsWebContentsDestroyed(); |
-#if defined(TOOLKIT_GTK) |
- CHROMEGTK_CALLBACK_0(Shell, void, OnBackButtonClicked); |
- CHROMEGTK_CALLBACK_0(Shell, void, OnForwardButtonClicked); |
- CHROMEGTK_CALLBACK_0(Shell, void, OnReloadButtonClicked); |
- CHROMEGTK_CALLBACK_0(Shell, void, OnStopButtonClicked); |
- CHROMEGTK_CALLBACK_0(Shell, void, OnURLEntryActivate); |
- CHROMEGTK_CALLBACK_0(Shell, gboolean, OnWindowDestroyed); |
- |
- CHROMEG_CALLBACK_3(Shell, gboolean, OnCloseWindowKeyPressed, GtkAccelGroup*, |
- GObject*, guint, GdkModifierType); |
- CHROMEG_CALLBACK_3(Shell, gboolean, OnNewWindowKeyPressed, GtkAccelGroup*, |
- GObject*, guint, GdkModifierType); |
- CHROMEG_CALLBACK_3(Shell, gboolean, OnHighlightURLView, GtkAccelGroup*, |
- GObject*, guint, GdkModifierType); |
- CHROMEG_CALLBACK_3(Shell, gboolean, OnReloadKeyPressed, GtkAccelGroup*, |
- GObject*, guint, GdkModifierType); |
-#endif |
- |
scoped_ptr<ShellJavaScriptDialogManager> dialog_manager_; |
scoped_ptr<WebContents> web_contents_; |
@@ -244,19 +226,7 @@ class Shell : public WebContentsDelegate, |
gfx::Size content_size_; |
-#if defined(TOOLKIT_GTK) |
- GtkWidget* vbox_; |
- |
- GtkToolItem* back_button_; |
- GtkToolItem* forward_button_; |
- GtkToolItem* reload_button_; |
- GtkToolItem* stop_button_; |
- |
- GtkWidget* spinner_; |
- GtkToolItem* spinner_item_; |
- |
- int ui_elements_height_; // height of menubar, toolbar, etc. |
-#elif defined(OS_ANDROID) |
+#if defined(OS_ANDROID) |
base::android::ScopedJavaGlobalRef<jobject> java_object_; |
#elif defined(USE_AURA) |
#if defined(OS_CHROMEOS) |