Move code for old, deprecated Options UI to only ChromeOS

chrome/browser/resources/BUILD.gn

 # 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.
 
 import("//chrome/common/features.gni")
 import("//tools/grit/grit_rule.gni")
 
 assert(!is_ios, "Chromium/iOS shouldn't use anything in //chrome")
 
 grit("invalidations_resources") {
@@ skipping 88 matching lines @@
 
     outputs = [
       "grit/component_extension_resources.h",
       "grit/component_extension_resources_map.cc",
       "grit/component_extension_resources_map.h",
       "component_extension_resources.pak",
     ]
     output_dir = "$root_gen_dir/chrome"
   }
 
-  grit("options_resources") {
-    source = "options_resources.grd"
-    defines = chrome_grit_defines
-    outputs = [
-      "grit/options_resources.h",
-      "options_resources.pak",
-    ]
-    output_dir = "$root_gen_dir/chrome"
+  if (is_chromeos) {

[Lei Zhang, 2017/06/09 04:22:53]

Move out of if (!is_android), i.e. no need for nested if.

[Dan Beam, 2017/06/09 06:32:55]

Done.

+    grit("options_resources") {
+      source = "options_resources.grd"
+      defines = chrome_grit_defines
+      outputs = [
+        "grit/options_resources.h",
+        "options_resources.pak",
+      ]
+      output_dir = "$root_gen_dir/chrome"
+    }
   }
 
   grit("settings_resources") {
     if (use_vulcanize) {
       source = "settings/settings_resources_vulcanized.grd"
       deps = [
         "//chrome/browser/resources/settings:build",
       ]
       grit_flags = [
         "-E",
@@ skipping 18 matching lines @@
   grit("sync_file_system_internals_resources") {
     source = "sync_file_system_internals_resources.grd"
     defines = chrome_grit_defines
     outputs = [
       "grit/sync_file_system_internals_resources.h",
       "sync_file_system_internals_resources.pak",
     ]
     output_dir = "$root_gen_dir/chrome"
   }
 }