Mandoline: Merge Surfaces and Views apps

components/view_manager/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("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//mojo/public/mojo_application.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 
   group("view_manager") {
     deps = [
       ":lib",
       ":loader",
-      "native_viewport",
     ]
   }
 
   source_set("loader") {
     sources = [
       "android_loader.cc",
       "android_loader.h",
     ]
 
     deps = [
       "public/interfaces",
       "//third_party/mojo/src/mojo/public/cpp/bindings",
     ]
   }
 } else {
   mojo_native_application("view_manager") {
     sources = [
       "main.cc",
     ]
 
     deps = [
       ":lib",
       "//base",
       "//components/view_manager/public/interfaces",
-      "//components/view_manager/native_viewport",
+      "//components/view_manager/surfaces",
       "//mojo/application/public/cpp",
       "//mojo/converters/geometry",
       "//mojo/environment:chromium",
       "//mojo/platform_handle",
       "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
       "//ui/events",
       "//ui/events/platform",
       "//ui/gl",
     ]
-
-    data_deps = [ "//components/view_manager/surfaces" ]
   }
 }
 
 source_set("lib") {
   sources = [
     "access_policy.h",
     "access_policy_delegate.h",
     "animation_runner.cc",
     "animation_runner.h",
     "animation_runner_observer.h",
@@ skipping 45 matching lines @@
   public_deps = [
     "//components/view_manager/public/cpp",
   ]
 
   deps = [
     "//base",
     "//cc/surfaces",
     "//cc/surfaces:surface_id",
     "//components/view_manager/public/cpp:common",
     "//components/view_manager/public/interfaces",
-    "//components/view_manager/native_viewport",
+    "//components/view_manager/surfaces",
     "//mojo/application/public/cpp",
     "//mojo/common:tracing_impl",
     "//mojo/converters/geometry",
     "//mojo/converters/ime",
     "//mojo/converters/input_events",
     "//mojo/converters/surfaces",
     "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
     "//ui/events",
     "//ui/events/platform",
     "//ui/gfx",
@@ skipping 89 matching lines @@
     "//components/view_manager/public/cpp",
     "//components/view_manager/public/cpp/tests:test_support",
     "//components/view_manager/public/interfaces",
     "//mojo/application/public/cpp:test_support",
     "//ui/mojo/geometry:interfaces",
     "//ui/mojo/geometry:util",
   ]
 
   data_deps = [ ":view_manager" ]
 }