[epiphany/dazzle] Use DzlApplicationWindow too

[Michael Catanzaro <mcatanzaro src gnome org>]

commit fb7108bfadefed6e98ab2be559415e7d584f5eff
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Aug 27 19:17:10 2017 -0500

    Use DzlApplicationWindow too
    
    RAZZLE DAZZLE!
    
    Also move the G_DEFINE_TYPE_WITH_CODE to the top of ephy-window.c so I
    don't have to scroll down 200 lines to find it.

 src/ephy-window.c |   20 +++++++++++++-------
 src/ephy-window.h |    3 ++-
 2 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 195ec98..6121fd3 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -52,6 +52,7 @@
 #include "popup-commands.h"
 #include "window-commands.h"
 
+#include <dazzle.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 #include <gio/gio.h>
@@ -73,6 +74,10 @@ static void ephy_window_change_allow_popup_windows_state (GSimpleAction *action,
                                                           GVariant      *state,
                                                           gpointer       user_data);
 
+static void ephy_window_embed_container_iface_init (EphyEmbedContainerInterface *iface);
+
+static void ephy_window_link_iface_init (EphyLinkInterface *iface);
+
 const struct {
   const char *action_and_target;
   const char *accelerators[9];
@@ -134,7 +139,7 @@ const struct {
 #define SETTINGS_CONNECTION_DATA_KEY    "EphyWindowSettings"
 
 struct _EphyWindow {
-  GtkApplicationWindow parent_instance;
+  DzlApplicationWindow parent_instance;
 
   GtkWidget *header_bar;
   EphyBookmarksManager *bookmarks_manager;
@@ -181,6 +186,13 @@ enum {
   SENS_FLAG_IS_BLANK      = 1 << 5
 };
 
+G_DEFINE_TYPE_WITH_CODE (EphyWindow, ephy_window, DZL_TYPE_APPLICATION_WINDOW,
+                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_LINK,
+                                                ephy_window_link_iface_init)
+                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_EMBED_CONTAINER,
+                                                ephy_window_embed_container_iface_init))
+
+
 static gint
 impl_add_child (EphyEmbedContainer *container,
                 EphyEmbed          *child,
@@ -390,12 +402,6 @@ ephy_window_link_iface_init (EphyLinkInterface *iface)
   iface->open_link = ephy_window_open_link;
 }
 
-G_DEFINE_TYPE_WITH_CODE (EphyWindow, ephy_window, GTK_TYPE_APPLICATION_WINDOW,
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_LINK,
-                                                ephy_window_link_iface_init)
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_EMBED_CONTAINER,
-                                                ephy_window_embed_container_iface_init))
-
 static void
 sync_chromes_visibility (EphyWindow *window)
 {
diff --git a/src/ephy-window.h b/src/ephy-window.h
index 1a6feab..3778833 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -25,13 +25,14 @@
 #include "ephy-location-controller.h"
 #include "ephy-web-view.h"
 
+#include <dazzle.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
 #define EPHY_TYPE_WINDOW (ephy_window_get_type ())
 
-G_DECLARE_FINAL_TYPE (EphyWindow, ephy_window, EPHY, WINDOW, GtkApplicationWindow)
+G_DECLARE_FINAL_TYPE (EphyWindow, ephy_window, EPHY, WINDOW, DzlApplicationWindow)
 
 typedef enum
 {