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

Side by Side Diff: components/html_viewer/html_document.h

Issue 1406153004: components/mus/public/interfaces View => Window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Yet another rebase 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/html_viewer/global_state.cc ('k') | components/html_viewer/html_document.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_HTML_VIEWER_HTML_DOCUMENT_H_ 5 #ifndef COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
6 #define COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_ 6 #define COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 // HTMLDocument is deleted in one of two ways: 48 // HTMLDocument is deleted in one of two ways:
49 // . When the Window the HTMLDocument is embedded in is destroyed. 49 // . When the Window the HTMLDocument is embedded in is destroyed.
50 // . Explicitly by way of Destroy(). 50 // . Explicitly by way of Destroy().
51 class HTMLDocument 51 class HTMLDocument
52 : public mus::WindowTreeDelegate, 52 : public mus::WindowTreeDelegate,
53 public HTMLFrameDelegate, 53 public HTMLFrameDelegate,
54 public mojo::InterfaceFactory<mojo::AxProvider>, 54 public mojo::InterfaceFactory<mojo::AxProvider>,
55 public mojo::InterfaceFactory<web_view::mojom::FrameClient>, 55 public mojo::InterfaceFactory<web_view::mojom::FrameClient>,
56 public mojo::InterfaceFactory<TestHTMLViewer>, 56 public mojo::InterfaceFactory<TestHTMLViewer>,
57 public mojo::InterfaceFactory<devtools_service::DevToolsAgent>, 57 public mojo::InterfaceFactory<devtools_service::DevToolsAgent>,
58 public mojo::InterfaceFactory<mojo::ViewTreeClient> { 58 public mojo::InterfaceFactory<mus::mojom::WindowTreeClient> {
59 public: 59 public:
60 using DeleteCallback = base::Callback<void(HTMLDocument*)>; 60 using DeleteCallback = base::Callback<void(HTMLDocument*)>;
61 61
62 // Load a new HTMLDocument with |response|. 62 // Load a new HTMLDocument with |response|.
63 // |html_document_app| is the application this app was created in, and 63 // |html_document_app| is the application this app was created in, and
64 // |connection| the specific connection triggering this new instance. 64 // |connection| the specific connection triggering this new instance.
65 // |setup| is used to obtain init type state (such as resources). 65 // |setup| is used to obtain init type state (such as resources).
66 HTMLDocument(mojo::ApplicationImpl* html_document_app, 66 HTMLDocument(mojo::ApplicationImpl* html_document_app,
67 mojo::ApplicationConnection* connection, 67 mojo::ApplicationConnection* connection,
68 mojo::URLResponsePtr response, 68 mojo::URLResponsePtr response,
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 129
130 // mojo::InterfaceFactory<TestHTMLViewer>: 130 // mojo::InterfaceFactory<TestHTMLViewer>:
131 void Create(mojo::ApplicationConnection* connection, 131 void Create(mojo::ApplicationConnection* connection,
132 mojo::InterfaceRequest<TestHTMLViewer> request) override; 132 mojo::InterfaceRequest<TestHTMLViewer> request) override;
133 133
134 // mojo::InterfaceFactory<devtools_service::DevToolsAgent>: 134 // mojo::InterfaceFactory<devtools_service::DevToolsAgent>:
135 void Create( 135 void Create(
136 mojo::ApplicationConnection* connection, 136 mojo::ApplicationConnection* connection,
137 mojo::InterfaceRequest<devtools_service::DevToolsAgent> request) override; 137 mojo::InterfaceRequest<devtools_service::DevToolsAgent> request) override;
138 138
139 // mojo::InterfaceFactory<mus::ViewTreeClient>: 139 // mojo::InterfaceFactory<mus::WindowTreeClient>:
140 void Create(mojo::ApplicationConnection* connection, 140 void Create(
141 mojo::InterfaceRequest<mojo::ViewTreeClient> request) override; 141 mojo::ApplicationConnection* connection,
142 mojo::InterfaceRequest<mus::mojom::WindowTreeClient> request) override;
142 143
143 scoped_ptr<mojo::AppRefCount> app_refcount_; 144 scoped_ptr<mojo::AppRefCount> app_refcount_;
144 mojo::ApplicationImpl* html_document_app_; 145 mojo::ApplicationImpl* html_document_app_;
145 mojo::ApplicationConnection* connection_; 146 mojo::ApplicationConnection* connection_;
146 147
147 // HTMLDocument owns these pointers; binding requests after document load. 148 // HTMLDocument owns these pointers; binding requests after document load.
148 std::set<AxProviderImpl*> ax_providers_; 149 std::set<AxProviderImpl*> ax_providers_;
149 150
150 ScopedVector<TestHTMLViewerImpl> test_html_viewers_; 151 ScopedVector<TestHTMLViewerImpl> test_html_viewers_;
151 152
(...skipping 18 matching lines...) Expand all
170 // initialized. 171 // initialized.
171 mojo::InterfaceRequest<devtools_service::DevToolsAgent> 172 mojo::InterfaceRequest<devtools_service::DevToolsAgent>
172 devtools_agent_request_; 173 devtools_agent_request_;
173 174
174 DISALLOW_COPY_AND_ASSIGN(HTMLDocument); 175 DISALLOW_COPY_AND_ASSIGN(HTMLDocument);
175 }; 176 };
176 177
177 } // namespace html_viewer 178 } // namespace html_viewer
178 179
179 #endif // COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_ 180 #endif // COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
OLDNEW
« no previous file with comments | « components/html_viewer/global_state.cc ('k') | components/html_viewer/html_document.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698