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

Side by Side Diff: chrome/browser/media_galleries/fileapi/itunes_data_provider.cc

Issue 559063002: Remove webkit/browser/, point everything to storage/browser/ instead (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up DEPS per feedback Created 6 years, 3 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/browser/media_galleries/fileapi/itunes_data_provider.h" 5 #include "chrome/browser/media_galleries/fileapi/itunes_data_provider.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/format_macros.h" 11 #include "base/format_macros.h"
12 #include "base/i18n/i18n_constants.h" 12 #include "base/i18n/i18n_constants.h"
13 #include "base/i18n/icu_string_conversions.h" 13 #include "base/i18n/icu_string_conversions.h"
14 #include "base/location.h" 14 #include "base/location.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/stl_util.h" 16 #include "base/stl_util.h"
17 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
18 #include "base/strings/stringprintf.h" 18 #include "base/strings/stringprintf.h"
19 #include "base/threading/thread_restrictions.h" 19 #include "base/threading/thread_restrictions.h"
20 #include "chrome/browser/media_galleries/fileapi/file_path_watcher_util.h" 20 #include "chrome/browser/media_galleries/fileapi/file_path_watcher_util.h"
21 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h" 21 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
22 #include "chrome/browser/media_galleries/imported_media_gallery_registry.h" 22 #include "chrome/browser/media_galleries/imported_media_gallery_registry.h"
23 #include "chrome/common/media_galleries/itunes_library.h" 23 #include "chrome/common/media_galleries/itunes_library.h"
24 #include "storage/browser/fileapi/native_file_util.h"
24 #include "third_party/icu/source/common/unicode/locid.h" 25 #include "third_party/icu/source/common/unicode/locid.h"
25 #include "webkit/browser/fileapi/native_file_util.h"
26 26
27 namespace itunes { 27 namespace itunes {
28 28
29 namespace { 29 namespace {
30 30
31 // Colon and slash are not allowed in filenames, replace them with underscore. 31 // Colon and slash are not allowed in filenames, replace them with underscore.
32 std::string SanitizeName(const std::string& input) { 32 std::string SanitizeName(const std::string& input) {
33 std::string result; 33 std::string result;
34 base::ConvertToUtf8AndNormalize(input, base::kCodepageUTF8, &result); 34 base::ConvertToUtf8AndNormalize(input, base::kCodepageUTF8, &result);
35 base::ReplaceChars(result, ":/", "_", &result); 35 base::ReplaceChars(result, ":/", "_", &result);
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 std::string album_name = SanitizeName(album_it->first); 293 std::string album_name = SanitizeName(album_it->first);
294 library_[artist_name][album_name] = 294 library_[artist_name][album_name] =
295 MakeUniqueTrackNames(album_it->second); 295 MakeUniqueTrackNames(album_it->second);
296 } 296 }
297 } 297 }
298 } 298 }
299 ready_callback.Run(valid()); 299 ready_callback.Run(valid());
300 } 300 }
301 301
302 } // namespace itunes 302 } // namespace itunes
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698