Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(320)

Unified Diff: components/web_view/web_view_impl.h

Issue 1326443006: mandoline: Add back/forward support and UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits and such. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/web_view/web_view_apptest.cc ('k') | components/web_view/web_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/web_view/web_view_impl.h
diff --git a/components/web_view/web_view_impl.h b/components/web_view/web_view_impl.h
index c10a7bef87877f894c0704eabfe54bb89584b6ab..3c6301c19192307e5f1c347d399c8ab869bc675c 100644
--- a/components/web_view/web_view_impl.h
+++ b/components/web_view/web_view_impl.h
@@ -7,6 +7,7 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
#include "components/view_manager/public/cpp/view_observer.h"
#include "components/view_manager/public/cpp/view_tree_delegate.h"
#include "components/web_view/frame_devtools_agent_delegate.h"
@@ -21,10 +22,11 @@ class ApplicationImpl;
namespace web_view {
class Frame;
-class FrameTree;
class FrameDevToolsAgent;
+class FrameTree;
class HTMLMessageEvent;
class PendingWebViewLoad;
+class URLRequestCloneable;
class WebViewImpl : public mojom::WebView,
public mojo::ViewTreeDelegate,
@@ -43,11 +45,18 @@ class WebViewImpl : public mojom::WebView,
// See description above |pending_load_| for details.
void OnLoad();
+ // Actually performs the load and tells our delegate the state of the
+ // forward/back list is. This is the shared implementation between
+ // LoadRequest() and Go{Back,Forward}().
+ void LoadRequestImpl(mojo::URLRequestPtr request);
+
// Overridden from WebView:
void LoadRequest(mojo::URLRequestPtr request) override;
void GetViewTreeClient(
mojo::InterfaceRequest<mojo::ViewTreeClient> view_tree_client)
override;
+ void GoBack() override;
+ void GoForward() override;
// Overridden from mojo::ViewTreeDelegate:
void OnEmbed(mojo::View* root) override;
@@ -89,6 +98,15 @@ class WebViewImpl : public mojom::WebView,
scoped_ptr<FrameDevToolsAgent> devtools_agent_;
+ // It would be nice if mojo::URLRequest were cloneable; however, its use of
+ // ScopedDataPipieConsumerHandle means that it isn't.
+ ScopedVector<URLRequestCloneable> back_list_;
+ ScopedVector<URLRequestCloneable> forward_list_;
+
+ // The request which is either currently loading or completed. Added to
+ // |back_list_| or |forward_list_| on further navigation.
+ scoped_ptr<URLRequestCloneable> current_page_request_;
+
DISALLOW_COPY_AND_ASSIGN(WebViewImpl);
};
« no previous file with comments | « components/web_view/web_view_apptest.cc ('k') | components/web_view/web_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698