Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Side by Side Diff: chrome/common/web_resource/web_resource_unpacker.cc

Issue 9960077: Modify the base::JSONReader interface to take a set of options rather than a boolean flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/common/web_resource/web_resource_unpacker.h" 5 #include "chrome/common/web_resource/web_resource_unpacker.h"
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 9
10 const char* WebResourceUnpacker::kInvalidDataTypeError = 10 const char* WebResourceUnpacker::kInvalidDataTypeError =
11 "Data from web resource server is missing or not valid JSON."; 11 "Data from web resource server is missing or not valid JSON.";
12 12
13 const char* WebResourceUnpacker::kUnexpectedJSONFormatError = 13 const char* WebResourceUnpacker::kUnexpectedJSONFormatError =
14 "Data from web resource server does not have expected format."; 14 "Data from web resource server does not have expected format.";
15 15
16 WebResourceUnpacker::WebResourceUnpacker(const std::string &resource_data) 16 WebResourceUnpacker::WebResourceUnpacker(const std::string &resource_data)
17 : resource_data_(resource_data) { 17 : resource_data_(resource_data) {
18 } 18 }
19 19
20 WebResourceUnpacker::~WebResourceUnpacker() { 20 WebResourceUnpacker::~WebResourceUnpacker() {
21 } 21 }
22 22
23 // TODO(mrc): Right now, this reads JSON data from the experimental popgadget 23 // TODO(mrc): Right now, this reads JSON data from the experimental popgadget
24 // server. Change so the format is based on a template, once we have 24 // server. Change so the format is based on a template, once we have
25 // decided on final server format. 25 // decided on final server format.
26 bool WebResourceUnpacker::Run() { 26 bool WebResourceUnpacker::Run() {
27 scoped_ptr<Value> value; 27 scoped_ptr<Value> value;
28 if (!resource_data_.empty()) { 28 if (!resource_data_.empty()) {
29 value.reset(base::JSONReader::Read(resource_data_, false)); 29 value.reset(base::JSONReader::Read(resource_data_));
30 if (!value.get()) { 30 if (!value.get()) {
31 // Page information not properly read, or corrupted. 31 // Page information not properly read, or corrupted.
32 error_message_ = kInvalidDataTypeError; 32 error_message_ = kInvalidDataTypeError;
33 return false; 33 return false;
34 } 34 }
35 if (!value->IsType(Value::TYPE_DICTIONARY)) { 35 if (!value->IsType(Value::TYPE_DICTIONARY)) {
36 error_message_ = kUnexpectedJSONFormatError; 36 error_message_ = kUnexpectedJSONFormatError;
37 return false; 37 return false;
38 } 38 }
39 parsed_json_.reset(static_cast<DictionaryValue*>(value.release())); 39 parsed_json_.reset(static_cast<DictionaryValue*>(value.release()));
40 return true; 40 return true;
41 } 41 }
42 error_message_ = kInvalidDataTypeError; 42 error_message_ = kInvalidDataTypeError;
43 return false; 43 return false;
44 } 44 }
45 45
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698