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 <memory>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 
 namespace extensions {
 
 namespace keys = manifest_keys;
 namespace errors = manifest_errors;
 
+namespace file_handler_verbs {
+
+const char kOpenWith[] = "open with";

[Devlin, 2016/05/20 21:08:16]

https://codereview.chromium.org/1872223002/diff/120001/extensions/common/mani...

You missed the underscores part. :)

[cmihail, 2016/05/23 02:46:13]

Done.

+const char kAddTo[] = "add to";
+const char kPackWith[] = "pack with";
+
+}  // namespace file_handler_verbs
+
 namespace {
+
 const int kMaxTypeAndExtensionHandlers = 200;
 const char kNotRecognized[] = "'%s' is not a recognized file handler property.";
+
+bool IsSupportedVerb(const std::string& verb) {
+  return verb == file_handler_verbs::kOpenWith ||
+         verb == file_handler_verbs::kAddTo ||
+         verb == file_handler_verbs::kPackWith;
 }
 
-FileHandlerInfo::FileHandlerInfo() : include_directories(false) {}
+}  // namespace
+
+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) &&

[Devlin, 2016/05/20 21:08:16]

This is wrong - it should be an || on this line, right?

if (has_key && (!GetKey || KeyInvalid)) {
}

Otherwise we'll never validate.

This also implies there should be a test for this. :)

[cmihail, 2016/05/23 02:46:13]

Done. 

+      !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 83 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 extensions