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/font_service/font_service_app.h" | 5 #include "components/font_service/font_service_app.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/files/file.h" | 9 #include "base/files/file.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 } | 51 } |
52 | 52 |
53 } // namespace | 53 } // namespace |
54 | 54 |
55 namespace font_service { | 55 namespace font_service { |
56 | 56 |
57 FontServiceApp::FontServiceApp() {} | 57 FontServiceApp::FontServiceApp() {} |
58 | 58 |
59 FontServiceApp::~FontServiceApp() {} | 59 FontServiceApp::~FontServiceApp() {} |
60 | 60 |
61 void FontServiceApp::Initialize(mojo::ApplicationImpl* app) { | 61 void FontServiceApp::Initialize(mojo::Shell* shell, const std::string& url, |
62 tracing_.Initialize(app); | 62 uint32_t id) { |
| 63 tracing_.Initialize(shell, url); |
63 } | 64 } |
64 | 65 |
65 bool FontServiceApp::AcceptConnection( | 66 bool FontServiceApp::AcceptConnection( |
66 mojo::ApplicationConnection* connection) { | 67 mojo::ApplicationConnection* connection) { |
67 connection->AddService(this); | 68 connection->AddService(this); |
68 return true; | 69 return true; |
69 } | 70 } |
70 | 71 |
71 void FontServiceApp::Create(mojo::ApplicationConnection* connection, | 72 void FontServiceApp::Create(mojo::ApplicationConnection* connection, |
72 mojo::InterfaceRequest<FontService> request) { | 73 mojo::InterfaceRequest<FontService> request) { |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 int count = paths_.count(); | 118 int count = paths_.count(); |
118 for (int i = 0; i < count; ++i) { | 119 for (int i = 0; i < count; ++i) { |
119 if (path == *paths_[i]) | 120 if (path == *paths_[i]) |
120 return i; | 121 return i; |
121 } | 122 } |
122 *paths_.append() = new SkString(path); | 123 *paths_.append() = new SkString(path); |
123 return count; | 124 return count; |
124 } | 125 } |
125 | 126 |
126 } // namespace font_service | 127 } // namespace font_service |
OLD | NEW |