diff options
Diffstat (limited to 'mandoline/ui')
4 files changed, 16 insertions, 11 deletions
diff --git a/mandoline/ui/desktop_ui/browser_window.cc b/mandoline/ui/desktop_ui/browser_window.cc index 069fa7d..111761a3 100644 --- a/mandoline/ui/desktop_ui/browser_window.cc +++ b/mandoline/ui/desktop_ui/browser_window.cc @@ -234,10 +234,18 @@ void BrowserWindow::OnAccelerator(uint32_t id, mojo::EventPtr event) { //////////////////////////////////////////////////////////////////////////////// // BrowserWindow, web_view::mojom::WebViewClient implementation: -void BrowserWindow::TopLevelNavigate(mojo::URLRequestPtr request) { +void BrowserWindow::TopLevelNavigateRequest(mojo::URLRequestPtr request) { Embed(request.Pass()); } +void BrowserWindow::TopLevelNavigationStarted(const mojo::String& url) { + GURL gurl(url); + bool changed = current_url_ != gurl; + current_url_ = gurl; + if (changed) + toolbar_view_->SetOmniboxText(base::UTF8ToUTF16(current_url_.spec())); +} + void BrowserWindow::LoadingStateChanged(bool is_loading, double progress) { progress_bar_->SetIsLoading(is_loading); progress_bar_->SetProgress(progress); @@ -268,13 +276,6 @@ void BrowserWindow::Embed(mojo::URLRequestPtr request) { EmbedOmnibox(); return; } - - GURL gurl(string_url); - bool changed = current_url_ != gurl; - current_url_ = gurl; - if (changed) - toolbar_view_->SetOmniboxText(base::UTF8ToUTF16(current_url_.spec())); - web_view_.web_view()->LoadRequest(request.Pass()); } diff --git a/mandoline/ui/desktop_ui/browser_window.h b/mandoline/ui/desktop_ui/browser_window.h index c420a63..368a572 100644 --- a/mandoline/ui/desktop_ui/browser_window.h +++ b/mandoline/ui/desktop_ui/browser_window.h @@ -61,7 +61,8 @@ class BrowserWindow : public mus::ViewTreeDelegate, void OnAccelerator(uint32_t id, mojo::EventPtr event) override; // Overridden from web_view::mojom::WebViewClient: - void TopLevelNavigate(mojo::URLRequestPtr request) override; + void TopLevelNavigateRequest(mojo::URLRequestPtr request) override; + void TopLevelNavigationStarted(const mojo::String& url) override; void LoadingStateChanged(bool is_loading, double progress) override; void BackForwardChanged(web_view::mojom::ButtonState back_button, web_view::mojom::ButtonState forward_button) override; diff --git a/mandoline/ui/phone_ui/phone_browser_application_delegate.cc b/mandoline/ui/phone_ui/phone_browser_application_delegate.cc index 616f0a7..d2ac75b 100644 --- a/mandoline/ui/phone_ui/phone_browser_application_delegate.cc +++ b/mandoline/ui/phone_ui/phone_browser_application_delegate.cc @@ -101,11 +101,13 @@ void PhoneBrowserApplicationDelegate::OnViewBoundsChanged( // PhoneBrowserApplicationDelegate, // web_view::mojom::WebViewClient implementation: -void PhoneBrowserApplicationDelegate::TopLevelNavigate( +void PhoneBrowserApplicationDelegate::TopLevelNavigateRequest( mojo::URLRequestPtr request) { web_view_.web_view()->LoadRequest(request.Pass()); } +void PhoneBrowserApplicationDelegate::TopLevelNavigationStarted( + const mojo::String& url) {} void PhoneBrowserApplicationDelegate::LoadingStateChanged(bool is_loading, double progress) {} diff --git a/mandoline/ui/phone_ui/phone_browser_application_delegate.h b/mandoline/ui/phone_ui/phone_browser_application_delegate.h index 20883ea..b747c92 100644 --- a/mandoline/ui/phone_ui/phone_browser_application_delegate.h +++ b/mandoline/ui/phone_ui/phone_browser_application_delegate.h @@ -54,7 +54,8 @@ class PhoneBrowserApplicationDelegate const mojo::Rect& new_bounds) override; // Overridden from web_view::mojom::WebViewClient: - void TopLevelNavigate(mojo::URLRequestPtr request) override; + void TopLevelNavigateRequest(mojo::URLRequestPtr request) override; + void TopLevelNavigationStarted(const mojo::String& url) override; void LoadingStateChanged(bool is_loading, double progress) override; void BackForwardChanged(web_view::mojom::ButtonState back_button, web_view::mojom::ButtonState forward_button) override; |