diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-26 22:47:40 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-26 22:47:40 +0000 |
| commit | 9d70b6adda0d7679bdc1ec82ffa1a526802d0112 (patch) | |
| tree | 536390315c42aed1a888571778c7a0aea548328b /mojo/examples/window_manager | |
| parent | 97ac197f96a95fcc83c2b371fe7ee7e26ad1d238 (diff) | |
| download | chromium_src-9d70b6adda0d7679bdc1ec82ffa1a526802d0112.zip chromium_src-9d70b6adda0d7679bdc1ec82ffa1a526802d0112.tar.gz chromium_src-9d70b6adda0d7679bdc1ec82ffa1a526802d0112.tar.bz2 | |
Mojo: Plumb html_viewer.cc navigations through navigator interface.
Before it was just loading via URLLoader. Now window_manager is in the loop and knows about URL changes and can choose where to perform the nav.
BUG=387216
R=darin@chromium.org
Review URL: https://codereview.chromium.org/346343003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280143 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/window_manager')
| -rw-r--r-- | mojo/examples/window_manager/window_manager.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mojo/examples/window_manager/window_manager.cc b/mojo/examples/window_manager/window_manager.cc index e737fbf..2ac4505 100644 --- a/mojo/examples/window_manager/window_manager.cc +++ b/mojo/examples/window_manager/window_manager.cc @@ -85,6 +85,8 @@ class NavigatorHost : public InterfaceImpl<navigation::NavigatorHost> { } private: + virtual void DidNavigateLocally(uint32 source_node_id, + const mojo::String& url) OVERRIDE; virtual void RequestNavigate( uint32 source_node_id, navigation::Target target, @@ -209,6 +211,11 @@ class WindowManager : public ApplicationDelegate, keyboard_manager_->Hide(view_id); } + void DidNavigateLocally(uint32 source_node_id, const mojo::String& url) { + LOG(ERROR) << "DidNavigateLocally: source_node_id: " << source_node_id + << " url: " << url.To<std::string>(); + } + void RequestNavigate( uint32 source_node_id, navigation::Target target, @@ -435,6 +442,11 @@ void WindowManagerConnection::HideKeyboard(Id node_id) { window_manager_->HideKeyboard(node_id); } +void NavigatorHost::DidNavigateLocally(uint32 source_node_id, + const mojo::String& url) { + window_manager_->DidNavigateLocally(source_node_id, url); +} + void NavigatorHost::RequestNavigate( uint32 source_node_id, navigation::Target target, |