OLD | NEW |
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 #include "components/html_viewer/html_document_oopif.h" | 5 #include "components/html_viewer/html_document_oopif.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 global_state_(global_state), | 67 global_state_(global_state), |
68 frame_(nullptr), | 68 frame_(nullptr), |
69 delete_callback_(delete_callback), | 69 delete_callback_(delete_callback), |
70 frame_creation_callback_(frame_creation_callback), | 70 frame_creation_callback_(frame_creation_callback), |
71 root_(nullptr) { | 71 root_(nullptr) { |
72 // TODO(sky): nuke headless. We're not going to care about it anymore. | 72 // TODO(sky): nuke headless. We're not going to care about it anymore. |
73 DCHECK(!global_state_->is_headless()); | 73 DCHECK(!global_state_->is_headless()); |
74 | 74 |
75 connection->AddService<mandoline::FrameTreeClient>(this); | 75 connection->AddService<mandoline::FrameTreeClient>(this); |
76 connection->AddService<AxProvider>(this); | 76 connection->AddService<AxProvider>(this); |
77 connection->AddService<mojo::ViewManagerClient>(this); | 77 connection->AddService<mojo::ViewTreeClient>(this); |
78 connection->AddService<devtools_service::DevToolsAgent>(this); | 78 connection->AddService<devtools_service::DevToolsAgent>(this); |
79 if (IsTestInterfaceEnabled()) | 79 if (IsTestInterfaceEnabled()) |
80 connection->AddService<TestHTMLViewer>(this); | 80 connection->AddService<TestHTMLViewer>(this); |
81 | 81 |
82 resource_waiter_.reset( | 82 resource_waiter_.reset( |
83 new DocumentResourceWaiter(global_state_, response.Pass(), this)); | 83 new DocumentResourceWaiter(global_state_, response.Pass(), this)); |
84 LoadIfNecessary(); | 84 LoadIfNecessary(); |
85 } | 85 } |
86 | 86 |
87 void HTMLDocumentOOPIF::Destroy() { | 87 void HTMLDocumentOOPIF::Destroy() { |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 if (frame_) { | 256 if (frame_) { |
257 if (frame_->devtools_agent()) | 257 if (frame_->devtools_agent()) |
258 frame_->devtools_agent()->BindToRequest(request.Pass()); | 258 frame_->devtools_agent()->BindToRequest(request.Pass()); |
259 } else { | 259 } else { |
260 devtools_agent_request_ = request.Pass(); | 260 devtools_agent_request_ = request.Pass(); |
261 } | 261 } |
262 } | 262 } |
263 | 263 |
264 void HTMLDocumentOOPIF::Create( | 264 void HTMLDocumentOOPIF::Create( |
265 mojo::ApplicationConnection* connection, | 265 mojo::ApplicationConnection* connection, |
266 mojo::InterfaceRequest<mojo::ViewManagerClient> request) { | 266 mojo::InterfaceRequest<mojo::ViewTreeClient> request) { |
267 mojo::ViewManager::Create(this, request.Pass()); | 267 mojo::ViewManager::Create(this, request.Pass()); |
268 } | 268 } |
269 | 269 |
270 } // namespace html_viewer | 270 } // namespace html_viewer |
OLD | NEW |