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

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

Issue 273193004: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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
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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 return true; 50 return true;
51 } 51 }
52 52
53 // Given the URL of a page and a favicon data URL, adds an appropriate record 53 // Given the URL of a page and a favicon data URL, adds an appropriate record
54 // to the given favicon usage vector. 54 // to the given favicon usage vector.
55 void DataURLToFaviconUsage( 55 void DataURLToFaviconUsage(
56 const GURL& link_url, 56 const GURL& link_url,
57 const GURL& favicon_data, 57 const GURL& favicon_data,
58 std::vector<ImportedFaviconUsage>* favicons) { 58 std::vector<ImportedFaviconUsage>* favicons) {
59 if (!link_url.is_valid() || !favicon_data.is_valid() || 59 if (!link_url.is_valid() || !favicon_data.is_valid() ||
60 !favicon_data.SchemeIs(content::kDataScheme)) 60 !favicon_data.SchemeIs(url::kDataScheme))
61 return; 61 return;
62 62
63 // Parse the data URL. 63 // Parse the data URL.
64 std::string mime_type, char_set, data; 64 std::string mime_type, char_set, data;
65 if (!net::DataURL::Parse(favicon_data, &mime_type, &char_set, &data) || 65 if (!net::DataURL::Parse(favicon_data, &mime_type, &char_set, &data) ||
66 data.empty()) 66 data.empty())
67 return; 67 return;
68 68
69 ImportedFaviconUsage usage; 69 ImportedFaviconUsage usage;
70 if (!importer::ReencodeFavicon( 70 if (!importer::ReencodeFavicon(
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 *url = GURL(value); 433 *url = GURL(value);
434 } 434 }
435 } 435 }
436 436
437 return true; 437 return true;
438 } 438 }
439 439
440 } // namespace internal 440 } // namespace internal
441 441
442 } // namespace bookmark_html_reader 442 } // namespace bookmark_html_reader
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698