| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 SERVICES_NAVIGATION_VIEW_IMPL_H_ | 5 #ifndef SERVICES_NAVIGATION_VIEW_IMPL_H_ |
| 6 #define SERVICES_NAVIGATION_VIEW_IMPL_H_ | 6 #define SERVICES_NAVIGATION_VIEW_IMPL_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "components/mus/public/cpp/window_tree_client_delegate.h" | 9 #include "components/mus/public/cpp/window_tree_client_delegate.h" |
| 10 #include "content/public/browser/web_contents_delegate.h" | 10 #include "content/public/browser/web_contents_delegate.h" |
| 11 #include "mojo/public/cpp/bindings/binding_set.h" | 11 #include "mojo/public/cpp/bindings/binding_set.h" |
| 12 #include "mojo/public/cpp/bindings/strong_binding.h" | 12 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 13 #include "services/navigation/public/interfaces/view.mojom.h" | 13 #include "services/navigation/public/interfaces/view.mojom.h" |
| 14 #include "services/shell/public/cpp/interface_factory.h" | 14 #include "services/shell/public/cpp/interface_factory.h" |
| 15 #include "services/shell/public/cpp/shell_client.h" | 15 #include "services/shell/public/cpp/shell_client.h" |
| 16 #include "services/shell/public/cpp/shell_connection_ref.h" | 16 #include "services/shell/public/cpp/shell_connection_ref.h" |
| 17 #include "ui/gfx/geometry/size.h" |
| 17 #include "ui/views/widget/widget_delegate.h" | 18 #include "ui/views/widget/widget_delegate.h" |
| 18 | 19 |
| 19 namespace views { | 20 namespace views { |
| 20 class WebView; | 21 class WebView; |
| 21 class Widget; | 22 class Widget; |
| 22 } | 23 } |
| 23 | 24 |
| 24 namespace navigation { | 25 namespace navigation { |
| 25 | 26 |
| 26 class ViewImpl : public mojom::View, | 27 class ViewImpl : public mojom::View, |
| (...skipping 12 matching lines...) Expand all Loading... |
| 39 // mojom::View: | 40 // mojom::View: |
| 40 void NavigateTo(const GURL& url) override; | 41 void NavigateTo(const GURL& url) override; |
| 41 void GoBack() override; | 42 void GoBack() override; |
| 42 void GoForward() override; | 43 void GoForward() override; |
| 43 void Reload(bool skip_cache) override; | 44 void Reload(bool skip_cache) override; |
| 44 void Stop() override; | 45 void Stop() override; |
| 45 void GetWindowTreeClient( | 46 void GetWindowTreeClient( |
| 46 mus::mojom::WindowTreeClientRequest request) override; | 47 mus::mojom::WindowTreeClientRequest request) override; |
| 47 void ShowInterstitial(const mojo::String& html) override; | 48 void ShowInterstitial(const mojo::String& html) override; |
| 48 void HideInterstitial() override; | 49 void HideInterstitial() override; |
| 50 void SetResizerSize(const gfx::Size& size) override; |
| 49 | 51 |
| 50 // content::WebContentsDelegate: | 52 // content::WebContentsDelegate: |
| 51 void AddNewContents(content::WebContents* source, | 53 void AddNewContents(content::WebContents* source, |
| 52 content::WebContents* new_contents, | 54 content::WebContents* new_contents, |
| 53 WindowOpenDisposition disposition, | 55 WindowOpenDisposition disposition, |
| 54 const gfx::Rect& initial_rect, | 56 const gfx::Rect& initial_rect, |
| 55 bool user_gesture, | 57 bool user_gesture, |
| 56 bool* was_blocked) override; | 58 bool* was_blocked) override; |
| 57 void CloseContents(content::WebContents* source) override; | 59 void CloseContents(content::WebContents* source) override; |
| 58 void LoadingStateChanged(content::WebContents* source, | 60 void LoadingStateChanged(content::WebContents* source, |
| 59 bool to_different_document) override; | 61 bool to_different_document) override; |
| 60 void NavigationStateChanged(content::WebContents* source, | 62 void NavigationStateChanged(content::WebContents* source, |
| 61 content::InvalidateTypes changed_flags) override; | 63 content::InvalidateTypes changed_flags) override; |
| 62 void LoadProgressChanged(content::WebContents* source, | 64 void LoadProgressChanged(content::WebContents* source, |
| 63 double progress) override; | 65 double progress) override; |
| 66 void UpdateTargetURL(content::WebContents* source, const GURL& url) override; |
| 67 gfx::Rect GetRootWindowResizerRect() const override; |
| 64 | 68 |
| 65 // mus::WindowTreeClientDelegate: | 69 // mus::WindowTreeClientDelegate: |
| 66 void OnEmbed(mus::Window* root) override; | 70 void OnEmbed(mus::Window* root) override; |
| 67 void OnWindowTreeClientDestroyed(mus::WindowTreeClient* client) override; | 71 void OnWindowTreeClientDestroyed(mus::WindowTreeClient* client) override; |
| 68 void OnEventObserved(const ui::Event& event, mus::Window* target) override; | 72 void OnEventObserved(const ui::Event& event, mus::Window* target) override; |
| 69 | 73 |
| 70 // views::WidgetDelegate: | 74 // views::WidgetDelegate: |
| 71 views::View* GetContentsView() override; | 75 views::View* GetContentsView() override; |
| 72 views::Widget* GetWidget() override; | 76 views::Widget* GetWidget() override; |
| 73 const views::Widget* GetWidget() const override; | 77 const views::Widget* GetWidget() const override; |
| 74 | 78 |
| 75 shell::Connector* connector_; | 79 shell::Connector* connector_; |
| 76 mojo::StrongBinding<mojom::View> binding_; | 80 mojo::StrongBinding<mojom::View> binding_; |
| 77 mojom::ViewClientPtr client_; | 81 mojom::ViewClientPtr client_; |
| 78 std::unique_ptr<shell::ShellConnectionRef> ref_; | 82 std::unique_ptr<shell::ShellConnectionRef> ref_; |
| 79 | 83 |
| 80 views::WebView* web_view_; | 84 views::WebView* web_view_; |
| 81 | 85 |
| 82 std::unique_ptr<content::WebContents> web_contents_; | 86 std::unique_ptr<content::WebContents> web_contents_; |
| 83 | 87 |
| 84 std::unique_ptr<views::Widget> widget_; | 88 std::unique_ptr<views::Widget> widget_; |
| 85 | 89 |
| 90 gfx::Size resizer_size_; |
| 91 |
| 86 DISALLOW_COPY_AND_ASSIGN(ViewImpl); | 92 DISALLOW_COPY_AND_ASSIGN(ViewImpl); |
| 87 }; | 93 }; |
| 88 | 94 |
| 89 } // navigation | 95 } // navigation |
| 90 | 96 |
| 91 #endif // SERVICES_NAVIGATION_VIEW_IMPL_H_ | 97 #endif // SERVICES_NAVIGATION_VIEW_IMPL_H_ |
| OLD | NEW |