| 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 #include "components/html_viewer/html_document_application_delegate.h" | 5 #include "components/html_viewer/html_document_application_delegate.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 request->handle = std::move(handle); | 47 request->handle = std::move(handle); |
| 48 requests_.push_back(std::move(request)); | 48 requests_.push_back(std::move(request)); |
| 49 } | 49 } |
| 50 | 50 |
| 51 ScopedVector<Request> requests_; | 51 ScopedVector<Request> requests_; |
| 52 | 52 |
| 53 DISALLOW_COPY_AND_ASSIGN(ServiceConnectorQueue); | 53 DISALLOW_COPY_AND_ASSIGN(ServiceConnectorQueue); |
| 54 }; | 54 }; |
| 55 | 55 |
| 56 HTMLDocumentApplicationDelegate::HTMLDocumentApplicationDelegate( | 56 HTMLDocumentApplicationDelegate::HTMLDocumentApplicationDelegate( |
| 57 mojo::ApplicationRequest request, | 57 mojo::ShellClientRequest request, |
| 58 mojo::URLResponsePtr response, | 58 mojo::URLResponsePtr response, |
| 59 GlobalState* global_state, | 59 GlobalState* global_state, |
| 60 scoped_ptr<mojo::AppRefCount> parent_app_refcount, | 60 scoped_ptr<mojo::AppRefCount> parent_app_refcount, |
| 61 const mojo::Callback<void()>& destruct_callback) | 61 const mojo::Callback<void()>& destruct_callback) |
| 62 : app_(this, | 62 : app_(this, |
| 63 std::move(request), | 63 std::move(request), |
| 64 base::Bind(&HTMLDocumentApplicationDelegate::OnTerminate, | 64 base::Bind(&HTMLDocumentApplicationDelegate::OnTerminate, |
| 65 base::Unretained(this))), | 65 base::Unretained(this))), |
| 66 parent_app_refcount_(std::move(parent_app_refcount)), | 66 parent_app_refcount_(std::move(parent_app_refcount)), |
| 67 url_(response->url), | 67 url_(response->url), |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 HTMLFrame::CreateParams* params) { | 177 HTMLFrame::CreateParams* params) { |
| 178 return new HTMLFrame(params); | 178 return new HTMLFrame(params); |
| 179 } | 179 } |
| 180 | 180 |
| 181 HTMLWidgetRootLocal* HTMLDocumentApplicationDelegate::CreateHTMLWidgetRootLocal( | 181 HTMLWidgetRootLocal* HTMLDocumentApplicationDelegate::CreateHTMLWidgetRootLocal( |
| 182 HTMLWidgetRootLocal::CreateParams* params) { | 182 HTMLWidgetRootLocal::CreateParams* params) { |
| 183 return new HTMLWidgetRootLocal(params); | 183 return new HTMLWidgetRootLocal(params); |
| 184 } | 184 } |
| 185 | 185 |
| 186 } // namespace html_viewer | 186 } // namespace html_viewer |
| OLD | NEW |