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

Side by Side Diff: chrome/utility/importer/bookmark_html_reader.cc

Issue 21696003: views/location_bar: Eliminate TouchableLocationBarView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 4 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 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/utility/importer/bookmark_html_reader.h" 5 #include "chrome/utility/importer/bookmark_html_reader.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/i18n/icu_string_conversions.h" 9 #include "base/i18n/icu_string_conversions.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 i < lines.size() && 109 i < lines.size() &&
110 (cancellation_callback.is_null() || !cancellation_callback.Run()); 110 (cancellation_callback.is_null() || !cancellation_callback.Run());
111 ++i) { 111 ++i) {
112 std::string line; 112 std::string line;
113 TrimString(lines[i], " ", &line); 113 TrimString(lines[i], " ", &line);
114 114
115 // Get the encoding of the bookmark file. 115 // Get the encoding of the bookmark file.
116 if (internal::ParseCharsetFromLine(line, &charset)) 116 if (internal::ParseCharsetFromLine(line, &charset))
117 continue; 117 continue;
118 118
119 // Skip line with starts with <HR> tag.
120 if (StartsWithASCII(line, "<HR>", false))
Peter Kasting 2013/08/09 20:57:28 This change should not be in this CL.
tfarina 2013/08/10 02:13:40 Ops, this shouldn't be here, this was for another
121 continue;
122
119 // Get the folder name. 123 // Get the folder name.
120 if (internal::ParseFolderNameFromLine(line, 124 if (internal::ParseFolderNameFromLine(line,
121 charset, 125 charset,
122 &last_folder, 126 &last_folder,
123 &last_folder_on_toolbar, 127 &last_folder_on_toolbar,
124 &last_folder_add_date)) { 128 &last_folder_add_date)) {
125 continue; 129 continue;
126 } 130 }
127 131
128 // Get the bookmark entry. 132 // Get the bookmark entry.
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 *url = GURL(value); 427 *url = GURL(value);
424 } 428 }
425 } 429 }
426 430
427 return true; 431 return true;
428 } 432 }
429 433
430 } // namespace internal 434 } // namespace internal
431 435
432 } // namespace bookmark_html_reader 436 } // namespace bookmark_html_reader
OLDNEW
« chrome/browser/ui/views/location_bar/location_icon_view.cc ('K') | « chrome/chrome_browser_ui.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698