projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
media_galleries
/
media_scan_manager.h
diff --git
a/src/chrome/browser/media_galleries/media_scan_manager.h
b/src/chrome/browser/media_galleries/media_scan_manager.h
index
0ff0f45
..
bbfc10c
100644
(file)
--- a/
src/chrome/browser/media_galleries/media_scan_manager.h
+++ b/
src/chrome/browser/media_galleries/media_scan_manager.h
@@
-34,7
+34,7
@@
class ExtensionRegistry;
class MediaScanManager : public extensions::ExtensionRegistryObserver {
public:
MediaScanManager();
class MediaScanManager : public extensions::ExtensionRegistryObserver {
public:
MediaScanManager();
-
virtual ~MediaScanManager()
;
+
~MediaScanManager() override
;
// There can only be ever one observer registered per profile. Does not take
// ownership of |observer|. An observer must be registered before scanning.
// There can only be ever one observer registered per profile. Does not take
// ownership of |observer|. An observer must be registered before scanning.
@@
-76,10
+76,10
@@
class MediaScanManager : public extensions::ExtensionRegistryObserver {
typedef std::map<Profile*, ScanObservers> ScanObserverMap;
// extensions::ExtensionRegistryObserver implementation.
typedef std::map<Profile*, ScanObservers> ScanObserverMap;
// extensions::ExtensionRegistryObserver implementation.
- v
irtual v
oid OnExtensionUnloaded(
+ void OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason)
OVERRIDE
;
+ extensions::UnloadedExtensionInfo::Reason reason)
override
;
bool ScanInProgress() const;
bool ScanInProgress() const;