Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / mojo / services / public / interfaces / navigation / navigation.mojom

diff --git a/src/mojo/services/public/interfaces/navigation/navigation.mojom b/src/mojo/services/public/interfaces/navigation/navigation.mojom
index dc565c3..6a9e94f 100644 (file)
--- a/src/mojo/services/public/interfaces/navigation/navigation.mojom
+++ b/src/mojo/services/public/interfaces/navigation/navigation.mojom
@@ -18,41 +18,13 @@ enum Target {
   NEW_NODE
 };
 
-struct NavigationDetails {
-  // TODO(mpcomplete): will we ever need more than the URLRequest? Can
-  // we pass that around directly?
-  URLRequest request = default;
-};
-
-struct ResponseDetails {
-  // TODO(beng): consider providing access to URLRequest too. Currently it is
-  //             not possible to obtain from the URLLoader.
-
-  URLResponse response;
-
-  // The URLLoader instance that generated the response. This must be kept
-  // alive until the response body has been completely consumed.
-  URLLoader loader;
-};
-
 // Embedders that support navigation of implement this interface.
 interface NavigatorHost {
-  RequestNavigate(uint32 source_node_id, Target target,
-                  NavigationDetails details);
+  RequestNavigate(Target target, URLRequest request);
 
   // Applications call this to inform hosts of navigations they performed
   // locally. For example, pushState() navigations in an HTML application.
-  DidNavigateLocally(uint32 source_node_id, string url);
-};
-
-// Applications implement this interface to support navigation of their views
-// by embedders.
-// |response_details| can be NULL when a navigation was not the result of a
-// network load.
-interface Navigator {
-  Navigate(uint32 node_id,
-           NavigationDetails navigation_details,
-           ResponseDetails response_details);
+  DidNavigateLocally(string url);
 };
 
 }