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 "content/renderer/manifest/manifest_manager.h" | 5 #include "content/renderer/manifest/manifest_manager.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/strings/nullable_string16.h" | 8 #include "base/strings/nullable_string16.h" |
9 #include "content/common/manifest_manager_messages.h" | 9 #include "content/common/manifest_manager_messages.h" |
10 #include "content/public/renderer/render_frame.h" | 10 #include "content/public/renderer/render_frame.h" |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 return; | 153 return; |
154 } | 154 } |
155 | 155 |
156 ManifestUmaUtil::FetchSucceeded(); | 156 ManifestUmaUtil::FetchSucceeded(); |
157 | 157 |
158 ManifestParser parser(data, response.url(), document_url); | 158 ManifestParser parser(data, response.url(), document_url); |
159 parser.Parse(); | 159 parser.Parse(); |
160 | 160 |
161 fetcher_.reset(); | 161 fetcher_.reset(); |
162 | 162 |
163 for (const scoped_ptr<ManifestParser::ErrorInfo>& error_info : | 163 for (const std::unique_ptr<ManifestParser::ErrorInfo>& error_info : |
164 parser.errors()) { | 164 parser.errors()) { |
165 blink::WebConsoleMessage message; | 165 blink::WebConsoleMessage message; |
166 message.level = blink::WebConsoleMessage::LevelError; | 166 message.level = blink::WebConsoleMessage::LevelError; |
167 message.text = blink::WebString::fromUTF8(error_info->error_msg); | 167 message.text = blink::WebString::fromUTF8(error_info->error_msg); |
168 message.url = | 168 message.url = |
169 render_frame()->GetWebFrame()->document().manifestURL().string(); | 169 render_frame()->GetWebFrame()->document().manifestURL().string(); |
170 message.lineNumber = error_info->error_line; | 170 message.lineNumber = error_info->error_line; |
171 message.columnNumber = error_info->error_column; | 171 message.columnNumber = error_info->error_column; |
172 render_frame()->GetWebFrame()->addMessageToConsole(message); | 172 render_frame()->GetWebFrame()->addMessageToConsole(message); |
173 } | 173 } |
(...skipping 20 matching lines...) Expand all Loading... |
194 | 194 |
195 pending_callbacks_.clear(); | 195 pending_callbacks_.clear(); |
196 | 196 |
197 for (std::list<GetManifestCallback>::const_iterator it = callbacks.begin(); | 197 for (std::list<GetManifestCallback>::const_iterator it = callbacks.begin(); |
198 it != callbacks.end(); ++it) { | 198 it != callbacks.end(); ++it) { |
199 it->Run(manifest); | 199 it->Run(manifest); |
200 } | 200 } |
201 } | 201 } |
202 | 202 |
203 } // namespace content | 203 } // namespace content |
OLD | NEW |