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

Side by Side Diff: base/json_reader.cc

Issue 46039: Removed unneeded includes of base/scoped_ptr.h. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 9 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
« no previous file with comments | « base/histogram.cc ('k') | base/logging.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "base/json_reader.h" 5 #include "base/json_reader.h"
6 6
7 #include "base/float_util.h" 7 #include "base/float_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/scoped_ptr.h"
9 #include "base/string_util.h" 10 #include "base/string_util.h"
10 #include "base/values.h" 11 #include "base/values.h"
11 12
12 static const JSONReader::Token kInvalidToken(JSONReader::Token::INVALID_TOKEN, 13 static const JSONReader::Token kInvalidToken(JSONReader::Token::INVALID_TOKEN,
13 0, 0); 14 0, 0);
14 static const int kStackLimit = 100; 15 static const int kStackLimit = 100;
15 16
16 namespace { 17 namespace {
17 18
18 inline int HexToInt(wchar_t c) { 19 inline int HexToInt(wchar_t c) {
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 if (*pos == '\n') { 632 if (*pos == '\n') {
632 ++line_number; 633 ++line_number;
633 column_number = 1; 634 column_number = 1;
634 } else { 635 } else {
635 ++column_number; 636 ++column_number;
636 } 637 }
637 } 638 }
638 639
639 error_message_ = FormatErrorMessage(line_number, column_number, description); 640 error_message_ = FormatErrorMessage(line_number, column_number, description);
640 } 641 }
OLDNEW
« no previous file with comments | « base/histogram.cc ('k') | base/logging.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698