Remove distilledpage_mobile.css and merge rules with other files.

Bug: 1027612
Change-Id: Ic4fe44c88ceac6db749336830c6f0abe15dbc68e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1931105Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Commit-Queue: Aran Gilman <gilmanmh@google.com>
Auto-Submit: Aran Gilman <gilmanmh@google.com>
Cr-Commit-Position: refs/heads/master@{#721582}

components/dom_distiller/core/css/distilledpage.css

@@ -279,6 +279,7 @@ video::-webkit-media-controls-fullscreen-button {
 #mainContent {
   flex: 1 1 auto;
   margin: 0 auto;
+  max-width: 35em;
   width: 100%;
 }
 
@@ -392,3 +393,9 @@ body .hidden {
   top: 0;
   width: 100%;
 }
+
+<if expr="is_ios or is_android">
+.desktopOnly {
+  display: none;
+}
+</if>

components/dom_distiller/core/css/distilledpage_mobile.css

-/* Copyright 2019 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. */
-
-/* This file should contain style shared by Android and iOS but not desktop. */
-
-#mainContent {
-  max-width: 35em;
-}
-
-.desktopOnly {
-  display: none;
-}

components/dom_distiller/core/viewer.cc

@@ -57,14 +57,10 @@ const char kMonospaceCssClass[] = "monospace";
 
 std::string GetPlatformSpecificCss() {
 #if defined(OS_IOS)
-  return base::StrCat(
-      {ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
-           IDR_DISTILLER_MOBILE_CSS),
-       ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
-           IDR_DISTILLER_IOS_CSS)});
-#elif defined(OS_ANDROID)
   return ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
-      IDR_DISTILLER_MOBILE_CSS);
+      IDR_DISTILLER_IOS_CSS);
+#elif defined(OS_ANDROID)
+  return "";
 #else  // Desktop
   return ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
       IDR_DISTILLER_DESKTOP_CSS);

components/resources/dom_distiller_resources.grdp

@@ -3,10 +3,9 @@
   <include name="IDR_DOM_DISTILLER_VIEWER_HTML" file="../dom_distiller/core/html/dom_distiller_viewer.html" type="BINDATA" compress="gzip" />
   <include name="IDR_DOM_DISTILLER_VIEWER_JS" file="../dom_distiller/core/javascript/dom_distiller_viewer.js" type="BINDATA" compress="gzip" />
   <include name="IDR_DISTILLER_JS" file="../dom_distiller/core/javascript/domdistiller.js" flattenhtml="true" type="BINDATA" compress="gzip" />
-  <include name="IDR_DISTILLER_CSS" file="../dom_distiller/core/css/distilledpage.css" type="BINDATA" compress="gzip" />
+  <include name="IDR_DISTILLER_CSS" file="../dom_distiller/core/css/distilledpage.css" type="BINDATA" compress="gzip" preprocess="true"/>
   <include name="IDR_DISTILLER_DESKTOP_CSS" file="../dom_distiller/core/css/distilledpage_desktop.css" type="BINDATA" compress="gzip" />
   <include name="IDR_DISTILLER_IOS_CSS" file="../dom_distiller/core/css/distilledpage_ios.css" type="BINDATA" compress="gzip" />
-  <include name="IDR_DISTILLER_MOBILE_CSS" file="../dom_distiller/core/css/distilledpage_mobile.css" type="BINDATA" compress="gzip" />
   <include name="IDR_DISTILLER_LOADING_IMAGE" file="../dom_distiller/core/images/dom_distiller_material_spinner.svg" type="BINDATA" compress="gzip" />
   <include name="IDR_EXTRACT_PAGE_FEATURES_JS" file="../dom_distiller/core/javascript/extract_features.js" type="BINDATA" compress="gzip" />
   <include name="IDR_DISTILLABLE_PAGE_SERIALIZED_MODEL_NEW" file="../dom_distiller/core/data/distillable_page_model_new.bin" type="BINDATA" compress="gzip" />