| Index: chrome/browser/apps/drive/drive_app_provider.cc
|
| diff --git a/chrome/browser/apps/drive/drive_app_provider.cc b/chrome/browser/apps/drive/drive_app_provider.cc
|
| index 795276474f2babac3b4ffaeed627e4e5b37e54d5..46ac570e617a7850927b458b10ae8ae42bc4d5f9 100644
|
| --- a/chrome/browser/apps/drive/drive_app_provider.cc
|
| +++ b/chrome/browser/apps/drive/drive_app_provider.cc
|
| @@ -21,6 +21,7 @@
|
| #include "extensions/browser/extension_registry.h"
|
| #include "extensions/browser/extension_registry_factory.h"
|
| #include "extensions/browser/extension_system.h"
|
| +#include "extensions/browser/uninstall_reason.h"
|
| #include "extensions/common/extension.h"
|
|
|
| using extensions::Extension;
|
| @@ -82,9 +83,8 @@ void DriveAppProvider::UpdateMappingAndExtensionSystem(
|
| if (existing_app && is_existing_app_generated) {
|
| extensions::ExtensionSystem::Get(profile_)
|
| ->extension_service()
|
| - ->UninstallExtension(existing_chrome_app_id,
|
| - ExtensionService::UNINSTALL_REASON_SYNC,
|
| - NULL);
|
| + ->UninstallExtension(
|
| + existing_chrome_app_id, extensions::UNINSTALL_REASON_SYNC, NULL);
|
| }
|
| }
|
|
|
| @@ -194,7 +194,7 @@ void DriveAppProvider::ProcessRemovedDriveApp(const std::string& drive_app_id) {
|
| extensions::ExtensionSystem::Get(profile_)
|
| ->extension_service()
|
| ->UninstallExtension(
|
| - chrome_app_id, ExtensionService::UNINSTALL_REASON_SYNC, NULL);
|
| + chrome_app_id, extensions::UNINSTALL_REASON_SYNC, NULL);
|
| }
|
|
|
| void DriveAppProvider::OnDriveAppRegistryUpdated() {
|
| @@ -257,7 +257,8 @@ void DriveAppProvider::OnExtensionInstalled(
|
|
|
| void DriveAppProvider::OnExtensionUninstalled(
|
| content::BrowserContext* browser_context,
|
| - const Extension* extension) {
|
| + const Extension* extension,
|
| + extensions::UninstallReason reason) {
|
| std::string drive_app_id = mapping_->GetDriveApp(extension->id());
|
| if (drive_app_id.empty())
|
| return;
|
|
|