drive: Rename DriveWebApp* to DriveApp

chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h"
 
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <sys/types.h>
 #include <utime.h>
@@ skipping 11 matching lines @@
 #include "base/memory/singleton.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_app_registry.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
-#include "chrome/browser/chromeos/drive/drive_webapps_registry.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/logging.h"
 #include "chrome/browser/chromeos/drive/search_metadata.h"
 #include "chrome/browser/chromeos/extensions/file_manager/file_browser_handler.h"
 #include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h"
 #include "chrome/browser/chromeos/extensions/file_manager/file_handler_util.h"
 #include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.h"
 #include "chrome/browser/chromeos/extensions/file_manager/zip_file_creator.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ skipping 704 matching lines @@
   TaskInfo(const string16& app_name, const GURL& icon_url)
       : app_name(app_name), icon_url(icon_url) {
   }
 
   string16 app_name;
   GURL icon_url;
 };
 
 // static
 void GetFileTasksFileBrowserFunction::GetAvailableDriveTasks(
-    drive::DriveWebAppsRegistry* registry,
+    drive::DriveAppRegistry* registry,
     const FileInfoList& file_info_list,
     TaskInfoMap* task_info_map) {
   DCHECK(registry);
   DCHECK(task_info_map);
   DCHECK(task_info_map->empty());
 
   bool is_first = true;
   for (size_t i = 0; i < file_info_list.size(); ++i) {
     const FileInfo& file_info = file_info_list[i];
     if (file_info.file_path.empty())
       continue;
 
-    ScopedVector<drive::DriveWebAppInfo> app_info_list;
-    registry->GetWebAppsForFile(
+    ScopedVector<drive::DriveAppInfo> app_info_list;
+    registry->GetAppsForFile(
         file_info.file_path, file_info.mime_type, &app_info_list);
 
     if (is_first) {
       // For the first file, we store all the info.
       for (size_t j = 0; j < app_info_list.size(); ++j) {
-        const drive::DriveWebAppInfo& app_info = *app_info_list[j];
+        const drive::DriveAppInfo& app_info = *app_info_list[j];
         GURL icon_url =
             FindPreferredIcon(app_info.app_icons, kPreferredIconSize);
         task_info_map->insert(std::pair<std::string, TaskInfo>(
             MakeWebAppTaskId(app_info.app_id),
             TaskInfo(app_info.app_name, icon_url)));
       }
     } else {
       // For remaining files, take the intersection with the current result,
       // based on the task id.
       std::set<std::string> task_id_set;
@@ skipping 74 matching lines @@
   DCHECK(default_already_set);
 
   if (file_info_list.empty())
     return true;
 
   drive::DriveIntegrationService* integration_service =
       drive::DriveIntegrationServiceFactory::GetForProfile(profile_);
   // |integration_service| is NULL if Drive is disabled. We return true in this
   // case because there might be other extension tasks, even if we don't have
   // any to add.
-  if (!integration_service || !integration_service->webapps_registry())
+  if (!integration_service || !integration_service->drive_app_registry())
     return true;
 
-  drive::DriveWebAppsRegistry* registry =
-      integration_service->webapps_registry();
+  drive::DriveAppRegistry* registry =
+      integration_service->drive_app_registry();
   DCHECK(registry);
 
   // Map of task_id to TaskInfo of available tasks.
   TaskInfoMap task_info_map;
   GetAvailableDriveTasks(registry, file_info_list, &task_info_map);
   std::set<std::string> default_tasks;
   FindDefaultDriveTasks(file_info_list, task_info_map, &default_tasks);
   CreateDriveTasks(
       task_info_map, default_tasks, result_list, default_already_set);
   return true;
@@ skipping 1541 matching lines @@
   // FillDriveEntryPropertiesValue().
   if (entry.get() && !entry->has_file_specific_info()) {
     CompleteGetFileProperties(error);
     return;
   }
 
   const drive::FileSpecificInfo& file_specific_info =
       entry->file_specific_info();
 
   // Get drive WebApps that can accept this file.
-  ScopedVector<drive::DriveWebAppInfo> web_apps;
-  integration_service->webapps_registry()->GetWebAppsForFile(
-      file_path_, file_specific_info.content_mime_type(), &web_apps);
-  if (!web_apps.empty()) {
+  ScopedVector<drive::DriveAppInfo> drive_apps;
+  integration_service->drive_app_registry()->GetAppsForFile(
+      file_path_, file_specific_info.content_mime_type(), &drive_apps);
+  if (!drive_apps.empty()) {
     std::string default_task_id = file_handler_util::GetDefaultTaskIdFromPrefs(
         profile_,
         file_specific_info.content_mime_type(),
         file_path_.Extension());
     std::string default_app_id;
     file_handler_util::CrackTaskID(
         default_task_id, &default_app_id, NULL, NULL);
 
     ListValue* apps = new ListValue();
     properties_->Set("driveApps", apps);
-    for (ScopedVector<drive::DriveWebAppInfo>::const_iterator it =
-             web_apps.begin();
-         it != web_apps.end(); ++it) {
-      const drive::DriveWebAppInfo* webapp_info = *it;
+    for (ScopedVector<drive::DriveAppInfo>::const_iterator it =
+             drive_apps.begin();
+         it != drive_apps.end(); ++it) {
+      const drive::DriveAppInfo* app_info = *it;
       DictionaryValue* app = new DictionaryValue();
-      app->SetString("appId", webapp_info->app_id);
-      app->SetString("appName", webapp_info->app_name);
-      GURL app_icon = FindPreferredIcon(webapp_info->app_icons,
+      app->SetString("appId", app_info->app_id);
+      app->SetString("appName", app_info->app_name);
+      GURL app_icon = FindPreferredIcon(app_info->app_icons,
                                         kPreferredIconSize);
       if (!app_icon.is_empty())
         app->SetString("appIcon", app_icon.spec());
-      GURL doc_icon = FindPreferredIcon(webapp_info->document_icons,
+      GURL doc_icon = FindPreferredIcon(app_info->document_icons,
                                         kPreferredIconSize);
       if (!doc_icon.is_empty())
         app->SetString("docIcon", doc_icon.spec());
-      app->SetString("objectType", webapp_info->object_type);
-      app->SetBoolean("isPrimary", default_app_id == webapp_info->app_id);
+      app->SetString("objectType", app_info->object_type);
+      app->SetBoolean("isPrimary", default_app_id == app_info->app_id);
       apps->Append(app);
     }
   }
 
   integration_service->file_system()->GetCacheEntryByResourceId(
       entry->resource_id(),
       file_specific_info.file_md5(),
       base::Bind(&GetDriveEntryPropertiesFunction::CacheStateReceived, this));
 }
 
@@ skipping 706 matching lines @@
 OpenNewWindowFunction::OpenNewWindowFunction() {}
 
 OpenNewWindowFunction::~OpenNewWindowFunction() {}
 
 bool OpenNewWindowFunction::RunImpl() {
   std::string url;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &url));
   file_manager_util::OpenNewWindow(profile_, GURL(url));
   return true;
 }