Revert 282355 "Add chrome/browser/ui to the GN build."

> Add chrome/browser/ui to the GN build.
> 
> This moves the intermediate grit files:
>   ui/ui_resources -> ui/resources
>   ui/ui_strings -> ui/strings
> in the GYP build to put it in line with the GN one (and also what one would expect).
> 
> R=ajwong@chromium.org
> 
> Review URL: https://codereview.chromium.org/381463002

TBR=brettw@chromium.org

Review URL: https://codereview.chromium.org/387573003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282359 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 3 insertions, 17 deletions

diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
index d0b3fd9..b0a8ab4 100644
--- a/build/config/BUILD.gn
+++ b/build/config/BUILD.gn
@@ -31,6 +31,7 @@ config("feature_flags") {
   # TODO(brettw) most of these need to be parameterized.
   defines = [
       "CHROMIUM_BUILD",
+      "ENABLE_ONE_CLICK_SIGNIN",
       "ENABLE_NOTIFICATIONS",
       "ENABLE_EGLIMAGE=1",
       "ENABLE_BACKGROUND=1",
@@ -180,9 +181,6 @@ config("feature_flags") {
   if (enable_google_now) {
     defines += [ "ENABLE_GOOGLE_NOW=1" ]
   }
-  if (enable_one_click_signin) {
-    defines += [ "ENABLE_ONE_CLICK_SIGNIN" ]
-  }
 }
 
 # Debug/release ----------------------------------------------------------------
diff --git a/build/config/features.gni b/build/config/features.gni
index e6cbc0f..07fd5a9 100644
--- a/build/config/features.gni
+++ b/build/config/features.gni
@@ -23,12 +23,6 @@ declare_args() {
 
   # Enables Native Client support.
   enable_nacl = (!is_ios && !is_android)
-
-  # If debug_devtools is set to true, JavaScript files for DevTools are stored
-  # as is and loaded from disk. Otherwise, a concatenated file is stored in
-  # resources.pak. It is still possible to load JS files from disk by passing
-  # --debug-devtools cmdline switch.
-  debug_devtools = false
 }
 
 # Additional dependent variables -----------------------------------------------
@@ -150,9 +144,3 @@ enable_image_loader_extension = is_chromeos
 enable_remoting = !is_ios && !is_android
 
 enable_google_now = !is_ios && !is_android
-
-enable_one_click_signin = is_win || is_mac || (is_linux && !is_chromeos)
-
-# Chrome OS: whether to also build the upcoming version of
-# ChromeVox, which can then be enabled via a command-line switch.
-enable_chromevox_next = false
diff --git a/build/config/ui.gni b/build/config/ui.gni
index b58d7ed..3e37d2d 100644
--- a/build/config/ui.gni
+++ b/build/config/ui.gni
@@ -14,7 +14,7 @@
 declare_args() {
   # Indicates if Ash is enabled. Ash is the Aura Shell which provides a
   # desktop-like environment for Aura. Requires use_aura = true
-  use_ash = is_win || is_linux
+  use_ash = is_win || is_chromeos
 
   # Indicates if Ozone is enabled. Ozone is a low-level library layer for Linux
   # that does not require X11.
@@ -25,7 +25,7 @@ declare_args() {
 
   # Indicates if Aura is enabled. Aura is a low-level windowing library, sort
   # of a replacement for GDI or GTK.
-  use_aura = is_win || is_linux
+  use_aura = is_linux || use_ozone || is_win || is_chromeos || use_ash
 
   # XInput2 multitouch support. Zero means disabled, nonzero indicates the
   # minimum XI2 version. For example, use_xi2_mt=2 means XI2.2 or above.