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

Side by Side Diff: components/web_view/web_view_impl.h

Issue 1350223005: mandoline: Make sure omnibox gets updated when navigating back/forwards. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot.merge Created 5 years, 2 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_WEB_VIEW_WEB_VIEW_IMPL_H_ 5 #ifndef COMPONENTS_WEB_VIEW_WEB_VIEW_IMPL_H_
6 #define COMPONENTS_WEB_VIEW_WEB_VIEW_IMPL_H_ 6 #define COMPONENTS_WEB_VIEW_WEB_VIEW_IMPL_H_
7 7
8 #include <string>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
10 #include "components/mus/public/cpp/view_observer.h" 12 #include "components/mus/public/cpp/view_observer.h"
11 #include "components/mus/public/cpp/view_tree_delegate.h" 13 #include "components/mus/public/cpp/view_tree_delegate.h"
12 #include "components/web_view/frame_devtools_agent_delegate.h" 14 #include "components/web_view/frame_devtools_agent_delegate.h"
13 #include "components/web_view/frame_tree_delegate.h" 15 #include "components/web_view/frame_tree_delegate.h"
14 #include "components/web_view/navigation_controller.h" 16 #include "components/web_view/navigation_controller.h"
15 #include "components/web_view/navigation_controller_delegate.h" 17 #include "components/web_view/navigation_controller_delegate.h"
16 #include "components/web_view/public/interfaces/web_view.mojom.h" 18 #include "components/web_view/public/interfaces/web_view.mojom.h"
17 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" 19 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
(...skipping 23 matching lines...) Expand all
41 public: 43 public:
42 WebViewImpl(mojo::ApplicationImpl* app, 44 WebViewImpl(mojo::ApplicationImpl* app,
43 mojom::WebViewClientPtr client, 45 mojom::WebViewClientPtr client,
44 mojo::InterfaceRequest<WebView> request); 46 mojo::InterfaceRequest<WebView> request);
45 ~WebViewImpl() override; 47 ~WebViewImpl() override;
46 48
47 private: 49 private:
48 friend class PendingWebViewLoad; 50 friend class PendingWebViewLoad;
49 51
50 // See description above |pending_load_| for details. 52 // See description above |pending_load_| for details.
51 void OnLoad(); 53 void OnLoad(const GURL& pending_url);
52 54
53 // Overridden from WebView: 55 // Overridden from WebView:
54 void LoadRequest(mojo::URLRequestPtr request) override; 56 void LoadRequest(mojo::URLRequestPtr request) override;
55 void GetViewTreeClient( 57 void GetViewTreeClient(
56 mojo::InterfaceRequest<mojo::ViewTreeClient> view_tree_client) 58 mojo::InterfaceRequest<mojo::ViewTreeClient> view_tree_client)
57 override; 59 override;
58 void GoBack() override; 60 void GoBack() override;
59 void GoForward() override; 61 void GoForward() override;
60 62
61 // Overridden from mus::ViewTreeDelegate: 63 // Overridden from mus::ViewTreeDelegate:
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 scoped_ptr<FrameDevToolsAgent> devtools_agent_; 107 scoped_ptr<FrameDevToolsAgent> devtools_agent_;
106 108
107 NavigationController navigation_controller_; 109 NavigationController navigation_controller_;
108 110
109 DISALLOW_COPY_AND_ASSIGN(WebViewImpl); 111 DISALLOW_COPY_AND_ASSIGN(WebViewImpl);
110 }; 112 };
111 113
112 } // namespace web_view 114 } // namespace web_view
113 115
114 #endif // COMPONENTS_WEB_VIEW_WEB_VIEW_IMPL_H_ 116 #endif // COMPONENTS_WEB_VIEW_WEB_VIEW_IMPL_H_
OLDNEW
« 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