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

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

Issue 1309103002: Revert of Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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/filesystem/files_test_base.h ('k') | components/html_viewer/html_frame.h » ('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 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"
11 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
12 11
13 namespace mojo { 12 namespace mojo {
14 class View; 13 class View;
15 } 14 }
16 15
17 namespace html_viewer { 16 namespace html_viewer {
18 17
19 class HTMLDocumentOOPIF; 18 class HTMLDocumentOOPIF;
20 class GlobalState; 19 class GlobalState;
21 20
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 // here. 75 // here.
77 mojo::InterfaceRequest<mandoline::FrameTreeClient> frame_tree_client_request_; 76 mojo::InterfaceRequest<mandoline::FrameTreeClient> frame_tree_client_request_;
78 mojo::Binding<mandoline::FrameTreeClient> frame_tree_client_binding_; 77 mojo::Binding<mandoline::FrameTreeClient> frame_tree_client_binding_;
79 78
80 DISALLOW_COPY_AND_ASSIGN(DocumentResourceWaiter); 79 DISALLOW_COPY_AND_ASSIGN(DocumentResourceWaiter);
81 }; 80 };
82 81
83 } // namespace html_viewer 82 } // namespace html_viewer
84 83
85 #endif // COMPONENTS_HTML_VIEWER_DOCUMENT_RESOURCE_WAITER_H_ 84 #endif // COMPONENTS_HTML_VIEWER_DOCUMENT_RESOURCE_WAITER_H_
OLDNEW
« no previous file with comments | « components/filesystem/files_test_base.h ('k') | components/html_viewer/html_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698