[epiphany] Remove chrome and popup parameters from ephy_shell_new_tab_full



commit 2f600c1548d93d041ea8a073a6ca510612063138
Author: Carlos Garcia Campos <cgarcia igalia com>
Date:   Tue Jan 28 12:17:04 2014 +0100

    Remove chrome and popup parameters from ephy_shell_new_tab_full
    
    It's always called with chome=ALL and is-popup=FALSE. The window is
    configured according to the WebKitWindowProperties of the view after is
    created.

 src/ephy-session.c      |    2 --
 src/ephy-shell.c        |   10 ++--------
 src/ephy-shell.h        |    2 --
 src/ephy-window.c       |   24 +-----------------------
 src/ephy-window.h       |    3 ---
 tests/ephy-shell-test.c |    4 ----
 6 files changed, 3 insertions(+), 42 deletions(-)
---
diff --git a/src/ephy-session.c b/src/ephy-session.c
index 3ab0df8..0a7747b 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -393,8 +393,6 @@ session_maybe_open_window (EphySession *session,
                                         NULL /* NetworkRequest */,
                                         EPHY_NEW_TAB_IN_NEW_WINDOW |
                                         EPHY_NEW_TAB_HOME_PAGE,
-                                        EPHY_WEB_VIEW_CHROME_ALL,
-                                        FALSE /* is popup? */,
                                         user_time);
        }
 }
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 2392c02..35b646c 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -645,8 +645,6 @@ ephy_shell_get_default (void)
  * @parent_window: the target #EphyWindow or %NULL
  * @previous_embed: the referrer embed, or %NULL
  * @request: a #WebKitNetworkRequest to load or %NULL
- * @chrome: a #EphyEmbedChrome mask to use if creating a new window
- * @is_popup: whether the new window is a popup
  * @user_time: a timestamp, or 0
  *
  * Create a new tab and the parent window when necessary.
@@ -660,8 +658,6 @@ ephy_shell_new_tab_full (EphyShell *shell,
                          EphyEmbed *previous_embed,
                          WebKitURIRequest *request,
                          EphyNewTabFlags flags,
-                         EphyWebViewChrome chrome,
-                         gboolean is_popup,
                          guint32 user_time)
 {
   EphyEmbedShell *embed_shell;
@@ -702,7 +698,7 @@ ephy_shell_new_tab_full (EphyShell *shell,
   if (!in_new_window && parent_window != NULL)
     window = parent_window;
   else
-    window = ephy_window_new_with_chrome (chrome, is_popup);
+    window = ephy_window_new ();
 
   if (flags & EPHY_NEW_TAB_APPEND_AFTER) {
     if (previous_embed) {
@@ -816,7 +812,7 @@ ephy_shell_new_tab (EphyShell *shell,
 
   embed = ephy_shell_new_tab_full (shell, parent_window,
                                    previous_embed, request, flags,
-                                   EPHY_WEB_VIEW_CHROME_ALL, FALSE, 0);
+                                   0);
 
   if (request)
     g_object_unref (request);
@@ -1124,8 +1120,6 @@ ephy_shell_open_uris_idle (OpenURIsData *data)
                                    data->previous_embed,
                                    request,
                                    data->flags | page_flags,
-                                   EPHY_WEB_VIEW_CHROME_ALL,
-                                   FALSE /* is popup? */,
                                    data->user_time);
 
   if (request)
diff --git a/src/ephy-shell.h b/src/ephy-shell.h
index 8aa3294..cd901bb 100644
--- a/src/ephy-shell.h
+++ b/src/ephy-shell.h
@@ -151,8 +151,6 @@ EphyEmbed      *ephy_shell_new_tab_full                 (EphyShell *shell,
                                                          EphyEmbed *previous_embed,
                                                          WebKitURIRequest *request,
                                                          EphyNewTabFlags flags,
-                                                         EphyWebViewChrome chrome,
-                                                         gboolean is_popup,
                                                          guint32 user_time);
 
 EphySession     *ephy_shell_get_session                  (EphyShell *shell);
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 0122c40..da4ff3b 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -2065,8 +2065,6 @@ create_web_view_cb (WebKitWebView *web_view,
                                         EPHY_GET_EMBED_FROM_EPHY_WEB_VIEW (web_view),
                                         NULL,
                                         flags,
-                                        EPHY_WEB_VIEW_CHROME_ALL,
-                                        FALSE, /* is popup? */
                                         0);
 
        new_web_view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed);
@@ -2231,7 +2229,7 @@ decide_policy_cb (WebKitWebView *web_view,
                                         embed,
                                         request,
                                         flags,
-                                        EPHY_WEB_VIEW_CHROME_ALL, FALSE, 0);
+                                        0);
 
                webkit_policy_decision_ignore (decision);
 
@@ -3615,26 +3613,6 @@ ephy_window_new (void)
 }
 
 /**
- * ephy_window_new_with_chrome:
- * @chrome: an #EphyWebViewChrome
- * @is_popup: whether the new window is a popup window
- *
- * Identical to ephy_window_new(), but allows you to specify a chrome.
- *
- * Return value: a new #EphyWindow
- **/
-EphyWindow *
-ephy_window_new_with_chrome (EphyWebViewChrome chrome,
-                            gboolean is_popup)
-{
-       return g_object_new (EPHY_TYPE_WINDOW,
-                            "chrome", chrome,
-                            "is-popup", is_popup,
-                            "application", GTK_APPLICATION (ephy_shell_get_default ()),
-                            NULL);
-}
-
-/**
  * ephy_window_get_ui_manager:
  * @window: an #EphyWindow
  *
diff --git a/src/ephy-window.h b/src/ephy-window.h
index b1ac400..44b2fe4 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -59,9 +59,6 @@ GType           ephy_window_get_type            (void);
 
 EphyWindow      *ephy_window_new                 (void);
 
-EphyWindow      *ephy_window_new_with_chrome     (EphyWebViewChrome chrome,
-                                                  gboolean is_popup);
-
 GtkUIManager    *ephy_window_get_ui_manager      (EphyWindow *window);
 
 GtkWidget       *ephy_window_get_notebook        (EphyWindow *window);
diff --git a/tests/ephy-shell-test.c b/tests/ephy-shell-test.c
index 857c030..a96607d 100644
--- a/tests/ephy-shell-test.c
+++ b/tests/ephy-shell-test.c
@@ -58,8 +58,6 @@ test_ephy_shell_basic_embeds (void)
                    NULL, /* embed */
                    NULL, /* network-request */
                    EPHY_NEW_TAB_DONT_SHOW_WINDOW | EPHY_NEW_TAB_IN_NEW_WINDOW, /* flags */
-                   EPHY_WEB_VIEW_CHROME_ALL, /* chrome */
-                   FALSE, /* popup */
                    gtk_get_current_event_time ());
   g_assert (EPHY_IS_EMBED (embed1));
 
@@ -77,8 +75,6 @@ test_ephy_shell_basic_embeds (void)
                    NULL, /* embed */
                    NULL, /* network-request */
                    EPHY_NEW_TAB_DONT_SHOW_WINDOW | EPHY_NEW_TAB_IN_EXISTING_WINDOW, /* flags */
-                   EPHY_WEB_VIEW_CHROME_ALL, /* chrome */
-                   FALSE, /* popup */
                    gtk_get_current_event_time ());
   g_assert (EPHY_IS_EMBED (embed2));
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]