OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/safe_json_parser.h" | 5 #include "chrome/browser/safe_json_parser.h" |
6 | 6 |
7 #include "chrome/common/chrome_utility_messages.h" | 7 #include "chrome/common/chrome_utility_messages.h" |
| 8 #include "chrome/grit/generated_resources.h" |
8 #include "content/public/browser/browser_thread.h" | 9 #include "content/public/browser/browser_thread.h" |
9 #include "content/public/browser/utility_process_host.h" | 10 #include "content/public/browser/utility_process_host.h" |
| 11 #include "ui/base/l10n/l10n_util.h" |
10 | 12 |
11 using content::BrowserThread; | 13 using content::BrowserThread; |
12 using content::UtilityProcessHost; | 14 using content::UtilityProcessHost; |
13 | 15 |
14 SafeJsonParser::SafeJsonParser(const std::string& unsafe_json, | 16 SafeJsonParser::SafeJsonParser(const std::string& unsafe_json, |
15 const SuccessCallback& success_callback, | 17 const SuccessCallback& success_callback, |
16 const ErrorCallback& error_callback) | 18 const ErrorCallback& error_callback) |
17 : unsafe_json_(unsafe_json), | 19 : unsafe_json_(unsafe_json), |
18 success_callback_(success_callback), | 20 success_callback_(success_callback), |
19 error_callback_(error_callback) {} | 21 error_callback_(error_callback) {} |
20 | 22 |
21 void SafeJsonParser::Start() { | 23 void SafeJsonParser::Start() { |
22 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 24 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
23 BrowserThread::PostTask( | 25 BrowserThread::PostTask( |
24 BrowserThread::IO, | 26 BrowserThread::IO, |
25 FROM_HERE, | 27 FROM_HERE, |
26 base::Bind(&SafeJsonParser::StartWorkOnIOThread, this)); | 28 base::Bind(&SafeJsonParser::StartWorkOnIOThread, this)); |
27 } | 29 } |
28 | 30 |
29 SafeJsonParser::~SafeJsonParser() {} | 31 SafeJsonParser::~SafeJsonParser() {} |
30 | 32 |
31 void SafeJsonParser::StartWorkOnIOThread() { | 33 void SafeJsonParser::StartWorkOnIOThread() { |
32 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 34 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
33 UtilityProcessHost* host = | 35 UtilityProcessHost* host = |
34 UtilityProcessHost::Create(this, base::MessageLoopProxy::current().get()); | 36 UtilityProcessHost::Create(this, base::MessageLoopProxy::current().get()); |
| 37 host->SetName(l10n_util::GetStringUTF16( |
| 38 IDS_UTILITY_PROCESS_JSON_PARSER_NAME)); |
35 host->Send(new ChromeUtilityMsg_ParseJSON(unsafe_json_)); | 39 host->Send(new ChromeUtilityMsg_ParseJSON(unsafe_json_)); |
36 } | 40 } |
37 | 41 |
38 void SafeJsonParser::OnJSONParseSucceeded(const base::ListValue& wrapper) { | 42 void SafeJsonParser::OnJSONParseSucceeded(const base::ListValue& wrapper) { |
39 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 43 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
40 const base::Value* value = NULL; | 44 const base::Value* value = NULL; |
41 CHECK(wrapper.Get(0, &value)); | 45 CHECK(wrapper.Get(0, &value)); |
42 | 46 |
43 parsed_json_.reset(value->DeepCopy()); | 47 parsed_json_.reset(value->DeepCopy()); |
44 ReportResults(); | 48 ReportResults(); |
(...skipping 29 matching lines...) Expand all Loading... |
74 bool handled = true; | 78 bool handled = true; |
75 IPC_BEGIN_MESSAGE_MAP(SafeJsonParser, message) | 79 IPC_BEGIN_MESSAGE_MAP(SafeJsonParser, message) |
76 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseJSON_Succeeded, | 80 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseJSON_Succeeded, |
77 OnJSONParseSucceeded) | 81 OnJSONParseSucceeded) |
78 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseJSON_Failed, | 82 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseJSON_Failed, |
79 OnJSONParseFailed) | 83 OnJSONParseFailed) |
80 IPC_MESSAGE_UNHANDLED(handled = false) | 84 IPC_MESSAGE_UNHANDLED(handled = false) |
81 IPC_END_MESSAGE_MAP() | 85 IPC_END_MESSAGE_MAP() |
82 return handled; | 86 return handled; |
83 } | 87 } |
OLD | NEW |