OLD | NEW |
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 MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_ | 5 #ifndef MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_ |
6 #define MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_ | 6 #define MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_ |
7 | 7 |
8 #include "components/mus/public/cpp/view_tree_connection.h" | 8 #include "components/mus/public/cpp/view_tree_connection.h" |
9 #include "components/mus/public/cpp/view_tree_delegate.h" | 9 #include "components/mus/public/cpp/view_tree_delegate.h" |
10 #include "components/mus/public/interfaces/view_tree_host.mojom.h" | 10 #include "components/mus/public/interfaces/view_tree_host.mojom.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 float DIPSToPixels(float value) const; | 54 float DIPSToPixels(float value) const; |
55 | 55 |
56 // Overridden from mus::ViewTreeDelegate: | 56 // Overridden from mus::ViewTreeDelegate: |
57 void OnEmbed(mus::View* root) override; | 57 void OnEmbed(mus::View* root) override; |
58 void OnConnectionLost(mus::ViewTreeConnection* connection) override; | 58 void OnConnectionLost(mus::ViewTreeConnection* connection) override; |
59 | 59 |
60 // Overridden from ViewTreeHostClient: | 60 // Overridden from ViewTreeHostClient: |
61 void OnAccelerator(uint32_t id, mojo::EventPtr event) override; | 61 void OnAccelerator(uint32_t id, mojo::EventPtr event) override; |
62 | 62 |
63 // Overridden from web_view::mojom::WebViewClient: | 63 // Overridden from web_view::mojom::WebViewClient: |
64 void TopLevelNavigate(mojo::URLRequestPtr request) override; | 64 void TopLevelNavigateRequest(mojo::URLRequestPtr request) override; |
| 65 void TopLevelNavigationStarted(const mojo::String& url) override; |
65 void LoadingStateChanged(bool is_loading, double progress) override; | 66 void LoadingStateChanged(bool is_loading, double progress) override; |
66 void BackForwardChanged(web_view::mojom::ButtonState back_button, | 67 void BackForwardChanged(web_view::mojom::ButtonState back_button, |
67 web_view::mojom::ButtonState forward_button) override; | 68 web_view::mojom::ButtonState forward_button) override; |
68 void TitleChanged(const mojo::String& title) override; | 69 void TitleChanged(const mojo::String& title) override; |
69 | 70 |
70 // Overridden from ViewEmbedder: | 71 // Overridden from ViewEmbedder: |
71 void Embed(mojo::URLRequestPtr request) override; | 72 void Embed(mojo::URLRequestPtr request) override; |
72 | 73 |
73 // Overridden from mojo::InterfaceFactory<ViewEmbedder>: | 74 // Overridden from mojo::InterfaceFactory<ViewEmbedder>: |
74 void Create(mojo::ApplicationConnection* connection, | 75 void Create(mojo::ApplicationConnection* connection, |
(...skipping 27 matching lines...) Expand all Loading... |
102 | 103 |
103 OmniboxPtr omnibox_; | 104 OmniboxPtr omnibox_; |
104 scoped_ptr<mojo::ApplicationConnection> omnibox_connection_; | 105 scoped_ptr<mojo::ApplicationConnection> omnibox_connection_; |
105 | 106 |
106 DISALLOW_COPY_AND_ASSIGN(BrowserWindow); | 107 DISALLOW_COPY_AND_ASSIGN(BrowserWindow); |
107 }; | 108 }; |
108 | 109 |
109 } // namespace mandoline | 110 } // namespace mandoline |
110 | 111 |
111 #endif // MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_ | 112 #endif // MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_ |
OLD | NEW |