Send orientation and display mode from Web Manifest to WebAPK server

chrome/browser/android/webapk/webapk_installer.cc

 // Copyright 2016 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/android/webapk/webapk_installer.h"
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/path_utils.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.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 "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/android/webapk/webapk.pb.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/common/manifest_util.h"
 #include "jni/WebApkInstaller_jni.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "third_party/smhasher/src/MurmurHash2.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "url/gurl.h"
 
 namespace {
 
 // The default WebAPK server URL.
@@ skipping 211 matching lines @@
   webapk->set_manifest_url(shortcut_info_.manifest_url.spec());
   webapk->set_requester_application_package(
       base::android::BuildInfo::GetInstance()->package_name());
   webapk->set_requester_application_version(version_info::GetVersionNumber());
 
   webapk::WebAppManifest* web_app_manifest = webapk->mutable_manifest();
   web_app_manifest->set_name(base::UTF16ToUTF8(shortcut_info_.name));
   web_app_manifest->set_short_name(
       base::UTF16ToUTF8(shortcut_info_.short_name));
   web_app_manifest->set_start_url(shortcut_info_.url.spec());
-  // TODO(pkotwicz): Add "display mode" and "orientation" to proto.
+  web_app_manifest->set_orientation(
+      content::WebScreenOrientationLockTypeToString(
+          shortcut_info_.orientation));
+  web_app_manifest->set_display_mode(
+      content::WebDisplayModeToString(shortcut_info_.display));
   web_app_manifest->set_background_color(
       ColorToString(shortcut_info_.background_color));
   web_app_manifest->set_theme_color(ColorToString(shortcut_info_.theme_color));
 
   std::string* scope = web_app_manifest->add_scopes();
   scope->assign(GetScope(shortcut_info_).spec());
   webapk::Image* image = web_app_manifest->add_icons();
   image->set_src(shortcut_info_.icon_url.spec());
   // TODO(pkotwicz): Get Murmur2 hash of untransformed icon's bytes (with no
   // encoding/decoding).
@@ skipping 12 matching lines @@
 
 void WebApkInstaller::OnSuccess() {
   finish_callback_.Run(true);
   delete this;
 }
 
 void WebApkInstaller::OnFailure() {
   finish_callback_.Run(false);
   delete this;
 }