Delete most web intents code.

chrome/browser/chromeos/extensions/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_browser_private_api.h"
 
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <sys/types.h>
 #include <utime.h>
@@ skipping 31 matching lines @@
 #include "chrome/browser/extensions/extension_function_registry.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/process_map.h"
 #include "chrome/browser/google_apis/drive_service_interface.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "chrome/browser/google_apis/operation_registry.h"
 #include "chrome/browser/google_apis/time_util.h"
-#include "chrome/browser/intents/web_intents_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
-#include "chrome/common/extensions/web_intents_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "googleurl/src/gurl.h"
 #include "grit/app_locale_settings.h"
 #include "grit/generated_resources.h"
 #include "grit/platform_locale_settings.h"
 #include "net/base/escape.h"
 #include "net/base/mime_util.h"
 #include "net/base/network_change_notifier.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 #include "webkit/chromeos/fileapi/cros_mount_point_provider.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/file_system_util.h"
-#include "webkit/glue/web_intent_service_data.h"
 #include "ui/webui/web_ui_util.h"
 
 using extensions::app_file_handler_util::FindFileHandlersForMimeTypes;
 using chromeos::disks::DiskMountManager;
 using content::BrowserContext;
 using content::BrowserThread;
 using content::ChildProcessSecurityPolicy;
 using content::SiteInstance;
 using content::WebContents;
 using extensions::Extension;
@@ skipping 178 matching lines @@
   if (icons.empty())
     return result;
   result = icons.rbegin()->second;
   for (InstalledApp::IconList::const_reverse_iterator iter = icons.rbegin();
        iter != icons.rend() && iter->first >= preferred_size; ++iter) {
         result = iter->second;
   }
   return result;
 }
 
-#if defined(ENABLE_WEB_INTENTS)
-// Finds the title of the given Web Intents |action|, if the passed extension
-// supports this action for all specified |mime_types|. Returns true and
-// provides the |title| as output on success.
-bool FindTitleForActionWithTypes(
-    const Extension* extension,
-    const std::string& action,
-    const std::set<std::string>& mime_types,
-    std::string* title) {
-  DCHECK(!mime_types.empty());
-  std::set<std::string> pending(mime_types.begin(), mime_types.end());
-  std::string found_title;
-
-  for (std::vector<webkit_glue::WebIntentServiceData>::const_iterator data =
-          extensions::WebIntentsInfo::GetIntentsServices(extension).begin();
-       data != extensions::WebIntentsInfo::GetIntentsServices(extension).end();
-       ++data) {
-    if (pending.empty())
-      break;
-
-    if (UTF16ToUTF8(data->action) != action)
-      continue;
-
-    std::set<std::string>::iterator pending_iter = pending.begin();
-    while (pending_iter != pending.end()) {
-      std::set<std::string>::iterator current = pending_iter++;
-      if (net::MatchesMimeType(UTF16ToUTF8(data->type), *current))
-        pending.erase(current);
-    }
-    if (found_title.empty())
-      found_title = UTF16ToUTF8(data->title);
-  }
-
-  // Not all mime-types have been found.
-  if (!pending.empty())
-    return false;
-
-  *title = found_title;
-  return true;
-}
-#endif  // defined(ENABLE_WEB_INTENTS)
-
 // Retrieves total and remaining available size on |mount_path|.
 void GetSizeStatsOnFileThread(const std::string& mount_path,
                               size_t* total_size_kb,
                               size_t* remaining_size_kb) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   uint64_t total_size_in_bytes = 0;
   uint64_t remaining_size_in_bytes = 0;
 
   struct statvfs stat = {};  // Zero-clear
@@ skipping 655 matching lines @@
         task->SetString("iconUrl", kDefaultIcon);
 
       task->SetBoolean("driveApp", false);
       result_list->Append(task);
     }
   }
 
   return true;
 }
 
-#if defined(ENABLE_WEB_INTENTS)
-// Find Web Intent platform apps that support the View task, and add them to
-// the |result_list|. These will be marked as kTaskWebIntent.
-bool GetFileTasksFileBrowserFunction::FindWebIntentTasks(
-    const std::vector<FilePath>& file_paths,
-    ListValue* result_list) {
-  DCHECK(!file_paths.empty());
-  ExtensionService* service = profile_->GetExtensionService();
-  if (!service)
-    return false;
-
-  std::set<std::string> mime_types;
-  GetMimeTypesForFileURLs(file_paths, &mime_types);
-
-  for (ExtensionSet::const_iterator iter = service->extensions()->begin();
-       iter != service->extensions()->end();
-       ++iter) {
-    const Extension* extension = *iter;
-
-    // We don't support using hosted apps to open files.
-    if (!extension->is_platform_app())
-      continue;
-
-    if (profile_->IsOffTheRecord() &&
-        !service->IsIncognitoEnabled(extension->id()))
-      continue;
-
-    std::string title;
-    if (!FindTitleForActionWithTypes(
-            extension, web_intents::kActionView, mime_types, &title))
-      continue;
-
-    DictionaryValue* task = new DictionaryValue;
-    std::string task_id = file_handler_util::MakeTaskID(extension->id(),
-        file_handler_util::kTaskWebIntent, web_intents::kActionView);
-    task->SetString("taskId", task_id);
-    task->SetString("title", title);
-    task->SetBoolean("isDefault", false);
-
-    GURL best_icon = extension->GetIconURL(kPreferredIconSize,
-                                           ExtensionIconSet::MATCH_BIGGER);
-    if (!best_icon.is_empty())
-      task->SetString("iconUrl", best_icon.spec());
-    else
-      task->SetString("iconUrl", kDefaultIcon);
-
-    task->SetBoolean("driveApp", false);
-    result_list->Append(task);
-  }
-
-  return true;
-}
-#endif  // defined(ENABLE_WEB_INTENTS)
-
 bool GetFileTasksFileBrowserFunction::RunImpl() {
   // First argument is the list of files to get tasks for.
   ListValue* files_list = NULL;
   if (!args_->GetList(0, &files_list))
     return false;
 
   // Second argument is the list of mime types of each of the files in the list.
   ListValue* mime_types_list = NULL;
   if (!args_->GetList(1, &mime_types_list))
     return false;
@@ skipping 88 matching lines @@
         default_tasks.find(*iter) != default_tasks.end()) {
       task->SetBoolean("isDefault", true);
       default_already_set = true;
     } else {
       task->SetBoolean("isDefault", false);
     }
 
     result_list->Append(task);
   }
 
-  // Take the union of platform app file handlers, Web Intents that platform
-  // apps may accept, and all previous Drive and extension tasks. As above, we
-  // know there aren't duplicates because they're entirely different kinds of
+  // Take the union of platform app file handlers,  and all previous Drive

[benwells, 2013/02/11 08:04:44]

Tiny nit: double space.

[Nico, 2013/02/11 15:16:12]

Done.

+  // and extension tasks. As above, we know there aren't duplicates because
+  // they're entirely different kinds of
   // tasks.
   if (!FindAppTasks(file_paths, result_list))
     return false;
 
-#if defined(ENABLE_WEB_INTENTS)
-  // TODO(benwells): remove the web intents tasks once we no longer support
-  // them.
-  if (!FindWebIntentTasks(file_paths, result_list))
-    return false;
-#endif
-
   if (VLOG_IS_ON(1)) {
     std::string result_json;
     base::JSONWriter::WriteWithOptions(
         result_list,
         base::JSONWriter::OPTIONS_DO_NOT_ESCAPE |
           base::JSONWriter::OPTIONS_PRETTY_PRINT,
         &result_json);
     VLOG(1) << "GetFileTasks result:\n" << result_json;
   }
 
@@ skipping 2168 matching lines @@
                  this, name.size()));
   return true;
 }
 
 void ValidatePathNameLengthFunction::OnFilePathLimitRetrieved(
     size_t current_length,
     size_t max_length) {
   SetResult(new base::FundamentalValue(current_length <= max_length));
   SendResponse(true);
 }