| Index: chrome/utility/importer/bookmark_html_reader.h
|
| diff --git a/chrome/utility/importer/bookmark_html_reader.h b/chrome/utility/importer/bookmark_html_reader.h
|
| index 8150347cefd0bc7cf6cccbce838ad8aae717c9f8..219fd772479b539f7d27a216964e1005c8919d10 100644
|
| --- a/chrome/utility/importer/bookmark_html_reader.h
|
| +++ b/chrome/utility/importer/bookmark_html_reader.h
|
| @@ -72,7 +72,7 @@ namespace internal {
|
|
|
| bool ParseCharsetFromLine(const std::string& line,
|
| std::string* charset);
|
| -bool ParseFolderNameFromLine(const std::string& line,
|
| +bool ParseFolderNameFromLine(std::string line,
|
| const std::string& charset,
|
| base::string16* folder_name,
|
| bool* is_toolbar_folder,
|
| @@ -80,7 +80,7 @@ bool ParseFolderNameFromLine(const std::string& line,
|
| // See above, this will also put the data: URL of the favicon into |*favicon|
|
| // if there is a favicon given. |post_data| is set for POST base keywords to
|
| // the contents of the actual POST (with %s for the search term).
|
| -bool ParseBookmarkFromLine(const std::string& line,
|
| +bool ParseBookmarkFromLine(std::string line,
|
| const std::string& charset,
|
| base::string16* title,
|
| GURL* url,
|
| @@ -96,7 +96,7 @@ bool ParseBookmarkFromLine(const std::string& line,
|
| // <dt><a href="url">name</a></dt>
|
| // <dt><a href="url">name</a></dt>
|
| // </dl>
|
| -bool ParseMinimumBookmarkFromLine(const std::string& line,
|
| +bool ParseMinimumBookmarkFromLine(std::string line,
|
| const std::string& charset,
|
| base::string16* title,
|
| GURL* url);
|
|
|