Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / apps / drive / drive_app_provider.cc

diff --git a/src/chrome/browser/apps/drive/drive_app_provider.cc b/src/chrome/browser/apps/drive/drive_app_provider.cc
index dac04b5..6e2c340 100644 (file)
--- a/src/chrome/browser/apps/drive/drive_app_provider.cc
+++ b/src/chrome/browser/apps/drive/drive_app_provider.cc
@@ -13,6 +13,7 @@
 #include "base/stl_util.h"
 #include "chrome/browser/apps/drive/drive_app_converter.h"
 #include "chrome/browser/apps/drive/drive_app_mapping.h"
+#include "chrome/browser/apps/drive/drive_app_uninstall_sync_service.h"
 #include "chrome/browser/apps/drive/drive_service_bridge.h"
 #include "chrome/browser/drive/drive_app_registry.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -34,8 +35,11 @@ void IgnoreUninstallResult(google_apis::GDataErrorCode) {
 
 }  // namespace
 
-DriveAppProvider::DriveAppProvider(Profile* profile)
+DriveAppProvider::DriveAppProvider(
+    Profile* profile,
+    DriveAppUninstallSyncService* uninstall_sync_service)
     : profile_(profile),
+      uninstall_sync_service_(uninstall_sync_service),
       service_bridge_(DriveServiceBridge::Create(profile).Pass()),
       mapping_(new DriveAppMapping(profile->GetPrefs())),
       weak_ptr_factory_(this) {
@@ -62,6 +66,32 @@ void DriveAppProvider::SetDriveServiceBridgeForTest(
   service_bridge_->GetAppRegistry()->AddObserver(this);
 }
 
+void DriveAppProvider::AddUninstalledDriveAppFromSync(
+    const std::string& drive_app_id) {
+  mapping_->AddUninstalledDriveApp(drive_app_id);
+
+  // Decouple the operation because this function could be called during
+  // sync processing and UpdateDriveApps could trigger another sync change.
+  // See http://crbug.com/429205
+  base::MessageLoop::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&DriveAppProvider::UpdateDriveApps,
+                 weak_ptr_factory_.GetWeakPtr()));
+}
+
+void DriveAppProvider::RemoveUninstalledDriveAppFromSync(
+    const std::string& drive_app_id) {
+  mapping_->RemoveUninstalledDriveApp(drive_app_id);
+
+  // Decouple the operation because this function could be called during
+  // sync processing and UpdateDriveApps could trigger another sync change.
+  // See http://crbug.com/429205
+  base::MessageLoop::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&DriveAppProvider::UpdateDriveApps,
+                 weak_ptr_factory_.GetWeakPtr()));
+}
+
 void DriveAppProvider::UpdateMappingAndExtensionSystem(
     const std::string& drive_app_id,
     const Extension* new_app,
@@ -98,6 +128,10 @@ void DriveAppProvider::ProcessDeferredOnExtensionInstalled(
   if (!app)
     return;
 
+  // Remove uninstall tracking for user installed app.
+  mapping_->RemoveUninstalledDriveApp(drive_app_id);
+  uninstall_sync_service_->UntrackUninstalledDriveApp(drive_app_id);
+
   UpdateMappingAndExtensionSystem(drive_app_id, app, false);
 }
 
@@ -201,12 +235,15 @@ void DriveAppProvider::ProcessRemovedDriveApp(const std::string& drive_app_id) {
                            NULL);
 }
 
-void DriveAppProvider::OnDriveAppRegistryUpdated() {
+void DriveAppProvider::UpdateDriveApps() {
   service_bridge_->GetAppRegistry()->GetAppList(&drive_apps_);
 
   IdSet current_ids;
-  for (size_t i = 0; i < drive_apps_.size(); ++i)
-    current_ids.insert(drive_apps_[i].app_id);
+  for (size_t i = 0; i < drive_apps_.size(); ++i) {
+    const std::string& drive_app_id = drive_apps_[i].app_id;
+    if (!mapping_->IsUninstalledDriveApp(drive_app_id))
+      current_ids.insert(drive_app_id);
+  }
 
   const IdSet existing_ids = mapping_->GetDriveAppIds();
   const IdSet ids_to_remove =
@@ -218,11 +255,16 @@ void DriveAppProvider::OnDriveAppRegistryUpdated() {
   }
 
   for (size_t i = 0; i < drive_apps_.size(); ++i) {
-    AddOrUpdateDriveApp(drive_apps_[i]);
+    if (!mapping_->IsUninstalledDriveApp(drive_apps_[i].app_id))
+      AddOrUpdateDriveApp(drive_apps_[i]);
   }
   SchedulePendingConverters();
 }
 
+void DriveAppProvider::OnDriveAppRegistryUpdated() {
+  UpdateDriveApps();
+}
+
 void DriveAppProvider::OnExtensionInstalled(
     content::BrowserContext* browser_context,
     const Extension* extension,
@@ -267,6 +309,18 @@ void DriveAppProvider::OnExtensionUninstalled(
   if (drive_app_id.empty())
     return;
 
-  service_bridge_->GetAppRegistry()->UninstallApp(
-      drive_app_id, base::Bind(&IgnoreUninstallResult));
+  for (size_t i = 0; i < drive_apps_.size(); ++i) {
+    if (drive_apps_[i].app_id != drive_app_id)
+      continue;
+
+    if (drive_apps_[i].is_removable) {
+      service_bridge_->GetAppRegistry()->UninstallApp(
+          drive_app_id, base::Bind(&IgnoreUninstallResult));
+    } else {
+      mapping_->AddUninstalledDriveApp(drive_app_id);
+      uninstall_sync_service_->TrackUninstalledDriveApp(drive_app_id);
+    }
+
+    return;
+  }
 }