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
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
extensions
/
extension_storage_monitor.cc
diff --git
a/src/chrome/browser/extensions/extension_storage_monitor.cc
b/src/chrome/browser/extensions/extension_storage_monitor.cc
index
750caaa
..
acae9b3
100644
(file)
--- a/
src/chrome/browser/extensions/extension_storage_monitor.cc
+++ b/
src/chrome/browser/extensions/extension_storage_monitor.cc
@@
-24,6
+24,7
@@
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/image_loader.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/image_loader.h"
+#include "extensions/browser/uninstall_reason.h"
#include "extensions/common/extension.h"
#include "extensions/common/manifest_handlers/icons_handler.h"
#include "extensions/common/permissions/permissions_data.h"
#include "extensions/common/extension.h"
#include "extensions/common/manifest_handlers/icons_handler.h"
#include "extensions/common/permissions/permissions_data.h"
@@
-303,7
+304,8
@@
void ExtensionStorageMonitor::OnExtensionWillBeInstalled(
void ExtensionStorageMonitor::OnExtensionUninstalled(
content::BrowserContext* browser_context,
void ExtensionStorageMonitor::OnExtensionUninstalled(
content::BrowserContext* browser_context,
- const Extension* extension) {
+ const Extension* extension,
+ extensions::UninstallReason reason) {
RemoveNotificationForExtension(extension->id());
}
RemoveNotificationForExtension(extension->id());
}
@@
-319,7
+321,11
@@
void ExtensionStorageMonitor::ExtensionUninstallAccepted() {
ExtensionService* service =
ExtensionSystem::Get(context_)->extension_service();
DCHECK(service);
ExtensionService* service =
ExtensionSystem::Get(context_)->extension_service();
DCHECK(service);
- service->UninstallExtension(extension->id(), false, NULL);
+ service->UninstallExtension(
+ extension->id(),
+ extensions::UNINSTALL_REASON_STORAGE_THRESHOLD_EXCEEDED,
+ base::Bind(&base::DoNothing),
+ NULL);
}
void ExtensionStorageMonitor::ExtensionUninstallCanceled() {
}
void ExtensionStorageMonitor::ExtensionUninstallCanceled() {