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

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

Issue 1239313004: More html_viewer OOPIF changes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile Created 5 years, 5 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
OLDNEW
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 COMPONENTS_HTML_VIEWER_DOCUMENT_RESOURCE_WAITER_H_ 5 #ifndef COMPONENTS_HTML_VIEWER_DOCUMENT_RESOURCE_WAITER_H_
6 #define COMPONENTS_HTML_VIEWER_DOCUMENT_RESOURCE_WAITER_H_ 6 #define COMPONENTS_HTML_VIEWER_DOCUMENT_RESOURCE_WAITER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "mandoline/tab/public/interfaces/frame_tree.mojom.h" 9 #include "mandoline/tab/public/interfaces/frame_tree.mojom.h"
10 #include "mojo/services/network/public/interfaces/url_loader.mojom.h" 10 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 mojo::View* root() { return root_; } 43 mojo::View* root() { return root_; }
44 44
45 void Bind(mojo::InterfaceRequest<mandoline::FrameTreeClient> request); 45 void Bind(mojo::InterfaceRequest<mandoline::FrameTreeClient> request);
46 46
47 private: 47 private:
48 // mandoline::FrameTreeClient: 48 // mandoline::FrameTreeClient:
49 void OnConnect(mandoline::FrameTreeServerPtr server, 49 void OnConnect(mandoline::FrameTreeServerPtr server,
50 mojo::Array<mandoline::FrameDataPtr> frame_data) override; 50 mojo::Array<mandoline::FrameDataPtr> frame_data) override;
51 void OnFrameAdded(mandoline::FrameDataPtr frame_data) override; 51 void OnFrameAdded(mandoline::FrameDataPtr frame_data) override;
52 void OnFrameRemoved(uint32_t frame_id) override; 52 void OnFrameRemoved(uint32_t frame_id) override;
53 void OnFrameNameChanged(uint32_t frame_id, const mojo::String& name) override;
53 54
54 GlobalState* global_state_; 55 GlobalState* global_state_;
55 HTMLDocumentOOPIF* document_; 56 HTMLDocumentOOPIF* document_;
56 mojo::URLResponsePtr response_; 57 mojo::URLResponsePtr response_;
57 mojo::View* root_; 58 mojo::View* root_;
58 mandoline::FrameTreeServerPtr server_; 59 mandoline::FrameTreeServerPtr server_;
59 mojo::Array<mandoline::FrameDataPtr> frame_data_; 60 mojo::Array<mandoline::FrameDataPtr> frame_data_;
60 61
61 // Once we get OnConnect() we unbind |frame_tree_client_binding_| and put it 62 // Once we get OnConnect() we unbind |frame_tree_client_binding_| and put it
62 // here. 63 // here.
63 mojo::InterfaceRequest<mandoline::FrameTreeClient> frame_tree_client_request_; 64 mojo::InterfaceRequest<mandoline::FrameTreeClient> frame_tree_client_request_;
64 mojo::Binding<mandoline::FrameTreeClient> frame_tree_client_binding_; 65 mojo::Binding<mandoline::FrameTreeClient> frame_tree_client_binding_;
65 66
66 DISALLOW_COPY_AND_ASSIGN(DocumentResourceWaiter); 67 DISALLOW_COPY_AND_ASSIGN(DocumentResourceWaiter);
67 }; 68 };
68 69
69 } // namespace html_viewer 70 } // namespace html_viewer
70 71
71 #endif // COMPONENTS_HTML_VIEWER_DOCUMENT_RESOURCE_WAITER_H_ 72 #endif // COMPONENTS_HTML_VIEWER_DOCUMENT_RESOURCE_WAITER_H_
OLDNEW
« no previous file with comments | « components/html_viewer/ax_provider_apptest.cc ('k') | components/html_viewer/document_resource_waiter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698