Add verbs API to file handlers. Modify the Chrome OS UI so that it displayes the internationalized …

extensions/common/manifest_handlers/file_handler_info.cc

 // Copyright 2014 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 "extensions/common/manifest_handlers/file_handler_info.h"
 
 #include <stddef.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/grit/generated_resources.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
+#include "ui/base/l10n/l10n_util.h"
 
 namespace extensions {
 
 namespace keys = manifest_keys;
 namespace errors = manifest_errors;
 
 namespace {
 const int kMaxTypeAndExtensionHandlers = 200;
 const char kNotRecognized[] = "'%s' is not a recognized file handler property.";
 }
 
-FileHandlerInfo::FileHandlerInfo() : include_directories(false) {}
+FileHandlerInfo::FileHandlerInfo()
+    : include_directories(false), verb(file_handler_verbs::kOpenWith) {}
 FileHandlerInfo::FileHandlerInfo(const FileHandlerInfo& other) = default;
 FileHandlerInfo::~FileHandlerInfo() {}
 
 FileHandlers::FileHandlers() {}
 FileHandlers::~FileHandlers() {}
 
 // static
 const FileHandlersInfo* FileHandlers::GetFileHandlers(
     const Extension* extension) {
   FileHandlers* info = static_cast<FileHandlers*>(
@@ skipping 35 matching lines @@
 
   handler.include_directories = false;
   if (handler_info.HasKey("include_directories") &&
       !handler_info.GetBoolean("include_directories",
                                &handler.include_directories)) {
     *error = ErrorUtils::FormatErrorMessageUTF16(
         errors::kInvalidFileHandlerIncludeDirectories, handler_id);
     return false;
   }
 
+  handler.verb = file_handler_verbs::kOpenWith;
+  if (handler_info.HasKey(keys::kFileHandlerVerb) &&
+      !handler_info.GetString(keys::kFileHandlerVerb, &handler.verb) &&
+      !file_handler_verbs::IsSupportedVerb(handler.verb)) {
+    *error = ErrorUtils::FormatErrorMessageUTF16(
+        errors::kInvalidFileHandlerVerb, handler_id);
+    return false;
+  }
+
   if ((!mime_types || mime_types->empty()) &&
       (!file_extensions || file_extensions->empty()) &&
       !handler.include_directories) {
     *error = ErrorUtils::FormatErrorMessageUTF16(
         errors::kInvalidFileHandlerNoTypeOrExtension,
         handler_id);
     return false;
   }
 
   if (mime_types) {
@@ skipping 82 matching lines @@
 
   extension->SetManifestData(keys::kFileHandlers, info.release());
   extension->AddInstallWarnings(install_warnings);
   return true;
 }
 
 const std::vector<std::string> FileHandlersParser::Keys() const {
   return SingleKey(keys::kFileHandlers);
 }
 
+namespace file_handler_verbs {
+
+const char kOpenWith[] = "OPEN_WITH";
+const char kAddTo[] = "ADD_TO";
+const char kPackWith[] = "PACK_WITH";
+
+bool IsSupportedVerb(const std::string& verb) {
+  std::set<std::string> supported_verbs;
+  supported_verbs.emplace(kOpenWith);
+  supported_verbs.emplace(kAddTo);
+  supported_verbs.emplace(kPackWith);
+  return supported_verbs.find(verb) != supported_verbs.end();
+}
+
+// Gets the internationlized title for an extension based on the extension name
+// and the associated handler verb.
+base::string16 GetTitleForExtensionAndVerb(const std::string& extension_name,

[mtomasz, 2016/04/13 09:17:06]

I'm OK to translate in C++, but I'm not sure if this is the proper place for
this code. Title is not part of file handler manifest section. Maybe we can move
to file_tasks.cc? Or moving it entirely to JavaScript may be simpler. Up to you.

[cmihail, 2016/04/18 01:28:10]

The reason I kept it here was due to make it easier for future extension as both
IsSupportedVerb and it's usage were in the same place. Otherwise I don't see any
reason to keep it in C++. I wrote the JS code for comparison.

+                                           const std::string& handler_verb) {
+  int button_label;
+  if (handler_verb == kOpenWith) {
+    button_label = IDS_FILE_BROWSER_OPEN_WITH_VERB_BUTTON_LABEL;
+  } else if (handler_verb == kAddTo) {
+    button_label = IDS_FILE_BROWSER_ADD_TO_VERB_BUTTON_LABEL;
+  } else if (handler_verb == kPackWith) {
+    button_label = IDS_FILE_BROWSER_PACK_WITH_VERB_BUTTON_LABEL;
+  } else {
+    // Should never reach this code if IsSupportedVerb is in sync.
+    DCHECK(false);

[mtomasz, 2016/04/13 09:17:06]

nit: DCHECK(false) -> NOTREACHED().

[cmihail, 2016/04/18 01:28:10]

ACK. N/A as moved this logic to JS.

+    // Fallback to OPEN_WITH.
+    button_label = IDS_FILE_BROWSER_OPEN_WITH_VERB_BUTTON_LABEL;
+  }
+
+  return base::ReplaceStringPlaceholders(
+      l10n_util::GetStringUTF16(button_label),
+      base::UTF8ToUTF16(extension_name), nullptr);
+}
+
+}  // namespace file_handler_verbs
+
 }  // namespace extensions