| Index: chrome/common/ini_parser.h
|
| diff --git a/base/ini_parser.h b/chrome/common/ini_parser.h
|
| similarity index 85%
|
| rename from base/ini_parser.h
|
| rename to chrome/common/ini_parser.h
|
| index 0aa7754d34d8020fa2ae57ce3b92ca97df9dc6b9..8d1023560de958bf72b6b98a7709b623234380ab 100644
|
| --- a/base/ini_parser.h
|
| +++ b/chrome/common/ini_parser.h
|
| @@ -2,17 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef BASE_INI_PARSER_H_
|
| -#define BASE_INI_PARSER_H_
|
| +#ifndef CHROME_COMMON_INI_PARSER_H_
|
| +#define CHROME_COMMON_INI_PARSER_H_
|
|
|
| #include <string>
|
|
|
| -#include "base/base_export.h"
|
| #include "base/basictypes.h"
|
| #include "base/values.h"
|
|
|
| -namespace base {
|
| -
|
| // Parses INI files in a string. Users should in inherit from this class.
|
| // This is a very basic INI parser with these characteristics:
|
| // - Ignores blank lines.
|
| @@ -28,7 +25,7 @@ namespace base {
|
| // - Key value pairs are indicated with an '=' character. Whitespace is not
|
| // ignored. Quoting is not supported. Everything before the first '='
|
| // is considered the |key|, and everything after is the |value|.
|
| -class BASE_EXPORT INIParser {
|
| +class INIParser {
|
| public:
|
| INIParser();
|
| virtual ~INIParser();
|
| @@ -46,12 +43,12 @@ class BASE_EXPORT INIParser {
|
|
|
| // Parsed values are stored as strings at the "section.key" path. Triplets with
|
| // |section| or |key| parameters containing '.' are ignored.
|
| -class BASE_EXPORT DictionaryValueINIParser : public INIParser {
|
| +class DictionaryValueINIParser : public INIParser {
|
| public:
|
| DictionaryValueINIParser();
|
| virtual ~DictionaryValueINIParser();
|
|
|
| - const DictionaryValue& root() const { return root_; }
|
| + const base::DictionaryValue& root() const { return root_; }
|
|
|
| private:
|
| // INIParser implementation.
|
| @@ -59,11 +56,9 @@ class BASE_EXPORT DictionaryValueINIParser : public INIParser {
|
| const std::string& key,
|
| const std::string& value) OVERRIDE;
|
|
|
| - DictionaryValue root_;
|
| + base::DictionaryValue root_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DictionaryValueINIParser);
|
| };
|
|
|
| -} // namespace base
|
| -
|
| -#endif // BASE_INI_PARSER_H_
|
| +#endif // CHROME_COMMON_INI_PARSER_H_
|
|
|