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

Side by Side Diff: chrome/browser/media_galleries/media_scan_manager.h

Issue 285433004: Have FindContainerScanResults() find broader media container directories (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unneeded local variable 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_SCAN_MANAGER_H_ 5 #ifndef CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_SCAN_MANAGER_H_
6 #define CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_SCAN_MANAGER_H_ 6 #define CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_SCAN_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 const extensions::Extension* extension, 75 const extensions::Extension* extension,
76 extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE; 76 extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE;
77 77
78 bool ScanInProgress() const; 78 bool ScanInProgress() const;
79 79
80 void OnScanCompleted( 80 void OnScanCompleted(
81 bool success, 81 bool success,
82 const MediaFolderFinder::MediaFolderFinderResults& found_folders); 82 const MediaFolderFinder::MediaFolderFinderResults& found_folders);
83 83
84 void OnFoundContainerDirectories( 84 void OnFoundContainerDirectories(
85 const MediaFolderFinder::MediaFolderFinderResults& found_folders,
86 const MediaFolderFinder::MediaFolderFinderResults& container_folders); 85 const MediaFolderFinder::MediaFolderFinderResults& container_folders);
87 86
88 scoped_ptr<MediaFolderFinder> folder_finder_; 87 scoped_ptr<MediaFolderFinder> folder_finder_;
89 88
90 base::Time scan_start_time_; 89 base::Time scan_start_time_;
91 90
92 // If not NULL, used to create |folder_finder_|. Used for testing. 91 // If not NULL, used to create |folder_finder_|. Used for testing.
93 MediaFolderFinderFactory testing_folder_finder_factory_; 92 MediaFolderFinderFactory testing_folder_finder_factory_;
94 93
95 // Set of extensions (on all profiles) that have an in-progress scan. 94 // Set of extensions (on all profiles) that have an in-progress scan.
96 ScanObserverMap observers_; 95 ScanObserverMap observers_;
97 96
98 ScopedObserver<extensions::ExtensionRegistry, 97 ScopedObserver<extensions::ExtensionRegistry,
99 extensions::ExtensionRegistryObserver> 98 extensions::ExtensionRegistryObserver>
100 scoped_extension_registry_observer_; 99 scoped_extension_registry_observer_;
101 100
102 base::WeakPtrFactory<MediaScanManager> weak_factory_; 101 base::WeakPtrFactory<MediaScanManager> weak_factory_;
103 102
104 DISALLOW_COPY_AND_ASSIGN(MediaScanManager); 103 DISALLOW_COPY_AND_ASSIGN(MediaScanManager);
105 }; 104 };
106 105
107 #endif // CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_SCAN_MANAGER_H_ 106 #endif // CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_SCAN_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698