Move platform-specific code for sky/shell into sky/shell/platform

This patch prepares us to add support for Mozart.

sky/shell/BUILD.gn

@@ -85,27 +85,27 @@ if (is_android) {
 
   generate_jni("jni_headers") {
     sources = [
-      "android/org/domokit/sky/shell/PlatformServiceProvider.java",
-      "android/org/domokit/sky/shell/PlatformViewAndroid.java",
-      "android/org/domokit/sky/shell/SkyMain.java",
-      "android/org/domokit/sky/shell/TracingController.java",
-      "android/org/domokit/sky/shell/UpdateService.java",
+      "platform/android/org/domokit/sky/shell/PlatformServiceProvider.java",
+      "platform/android/org/domokit/sky/shell/PlatformViewAndroid.java",
+      "platform/android/org/domokit/sky/shell/SkyMain.java",
+      "platform/android/org/domokit/sky/shell/TracingController.java",
+      "platform/android/org/domokit/sky/shell/UpdateService.java",
     ]
     jni_package = "sky/shell"
   }
 
   shared_library("sky_shell") {
     sources = [
-      "android/library_loader.cc",
-      "android/platform_service_provider_android.cc",
-      "android/platform_service_provider_android.h",
-      "android/platform_view_android.cc",
-      "android/platform_view_android.h",
-      "android/sky_main.cc",
-      "android/sky_main.h",
-      "android/tracing_controller.cc",
-      "android/tracing_controller.h",
-      "android/update_service_android.cc",
+      "platform/android/library_loader.cc",
+      "platform/android/platform_service_provider_android.cc",
+      "platform/android/platform_service_provider_android.h",
+      "platform/android/platform_view_android.cc",
+      "platform/android/platform_view_android.h",
+      "platform/android/sky_main.cc",
+      "platform/android/sky_main.h",
+      "platform/android/tracing_controller.cc",
+      "platform/android/tracing_controller.h",
+      "platform/android/update_service_android.cc",
     ]
 
     deps = common_deps + [
@@ -121,17 +121,17 @@ if (is_android) {
 
   android_library("java") {
     java_files = [
-      "android/org/domokit/sky/shell/PlatformServiceProvider.java",
-      "android/org/domokit/sky/shell/PlatformViewAndroid.java",
-      "android/org/domokit/sky/shell/ResourceCleaner.java",
-      "android/org/domokit/sky/shell/ResourceExtractor.java",
-      "android/org/domokit/sky/shell/ServiceFactory.java",
-      "android/org/domokit/sky/shell/ServiceRegistry.java",
-      "android/org/domokit/sky/shell/SkyActivity.java",
-      "android/org/domokit/sky/shell/SkyApplication.java",
-      "android/org/domokit/sky/shell/SkyMain.java",
-      "android/org/domokit/sky/shell/TracingController.java",
-      "android/org/domokit/sky/shell/UpdateService.java",
+      "platform/android/org/domokit/sky/shell/PlatformServiceProvider.java",
+      "platform/android/org/domokit/sky/shell/PlatformViewAndroid.java",
+      "platform/android/org/domokit/sky/shell/ResourceCleaner.java",
+      "platform/android/org/domokit/sky/shell/ResourceExtractor.java",
+      "platform/android/org/domokit/sky/shell/ServiceFactory.java",
+      "platform/android/org/domokit/sky/shell/ServiceRegistry.java",
+      "platform/android/org/domokit/sky/shell/SkyActivity.java",
+      "platform/android/org/domokit/sky/shell/SkyApplication.java",
+      "platform/android/org/domokit/sky/shell/SkyMain.java",
+      "platform/android/org/domokit/sky/shell/TracingController.java",
+      "platform/android/org/domokit/sky/shell/UpdateService.java",
     ]
 
     deps = [
@@ -173,7 +173,7 @@ if (is_android) {
 
   android_apk("shell") {
     apk_name = "SkyShell"
-    android_manifest = "android/AndroidManifest.xml"
+    android_manifest = "platform/android/AndroidManifest.xml"
 
     native_libs = [ "libsky_shell.so" ]
     asset_location = "$root_build_dir/sky_shell/assets"
@@ -195,22 +195,22 @@ if (is_android) {
 
   source_set("ios_scaffolding") {
     sources = [
-      "ios/main_ios.mm",
-      "ios/sky_app_delegate.h",
-      "ios/sky_app_delegate.mm",
-      "ios/sky_surface.h",
-      "ios/sky_surface.mm",
-      "ios/sky_view_controller.h",
-      "ios/sky_view_controller.mm",
+      "platform/ios/main_ios.mm",
+      "platform/ios/sky_app_delegate.h",
+      "platform/ios/sky_app_delegate.mm",
+      "platform/ios/sky_surface.h",
+      "platform/ios/sky_surface.mm",
+      "platform/ios/sky_view_controller.h",
+      "platform/ios/sky_view_controller.mm",
     ]
 
     set_sources_assignment_filter([])
     sources += [
-      "mac/platform_mac.h",
-      "mac/platform_mac.mm",
-      "mac/platform_service_provider_mac.cc",
-      "mac/platform_view_mac.h",
-      "mac/platform_view_mac.mm",
+      "platform/mac/platform_mac.h",
+      "platform/mac/platform_mac.mm",
+      "platform/mac/platform_service_provider_mac.cc",
+      "platform/mac/platform_view_mac.h",
+      "platform/mac/platform_view_mac.mm",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
 
@@ -231,9 +231,9 @@ if (is_android) {
     output_name = "sky_shell"
 
     sources = [
-      "linux/main_linux.cc",
-      "linux/platform_service_provider_linux.cc",
-      "linux/platform_view_linux.cc",
+      "platform/linux/main_linux.cc",
+      "platform/linux/platform_service_provider_linux.cc",
+      "platform/linux/platform_view_linux.cc",
     ] + testing_sources
 
     deps = common_deps + [
@@ -246,18 +246,18 @@ if (is_android) {
 
   source_set("mac_scaffolding") {
     sources = [
-      "mac/main_mac.mm",
-      "mac/platform_mac.h",
-      "mac/platform_mac.mm",
-      "mac/platform_service_provider_mac.cc",
-      "mac/platform_view_mac.h",
-      "mac/platform_view_mac.mm",
-      "mac/sky_app_delegate.h",
-      "mac/sky_app_delegate.m",
-      "mac/sky_application.h",
-      "mac/sky_application.mm",
-      "mac/sky_window.h",
-      "mac/sky_window.mm",
+      "platform/mac/main_mac.mm",
+      "platform/mac/platform_mac.h",
+      "platform/mac/platform_mac.mm",
+      "platform/mac/platform_service_provider_mac.cc",
+      "platform/mac/platform_view_mac.h",
+      "platform/mac/platform_view_mac.mm",
+      "platform/mac/sky_app_delegate.h",
+      "platform/mac/sky_app_delegate.m",
+      "platform/mac/sky_application.h",
+      "platform/mac/sky_application.mm",
+      "platform/mac/sky_window.h",
+      "platform/mac/sky_window.mm",
     ] + testing_sources
 
     deps = common_deps + [
@@ -269,14 +269,14 @@ if (is_android) {
 
   mac_app("shell") {
     app_name = "SkyShell"
-    info_plist = "mac/Info.plist"
+    info_plist = "platform/mac/Info.plist"
 
-    xibs = [ "mac/sky_mac.xib" ]
+    xibs = [ "platform/mac/sky_mac.xib" ]
 
     resource_copy_mac("sky_resources") {
       resources = [
         "//third_party/icu/android/icudtl.dat",
-        "ios/LaunchScreen.storyboardc"
+        "platform/ios/LaunchScreen.storyboardc"
       ]
       bundle_directory = "."
     }

sky/shell/android/library_loader.cc → sky/shell/platform/android/library_loader.cc

@@ -11,11 +11,11 @@
 #include "base/logging.h"
 #include "mojo/android/system/base_run_loop.h"
 #include "mojo/android/system/core_impl.h"
-#include "sky/shell/android/platform_service_provider_android.h"
-#include "sky/shell/android/platform_view_android.h"
-#include "sky/shell/android/sky_main.h"
-#include "sky/shell/android/tracing_controller.h"
-#include "sky/shell/android/update_service_android.h"
+#include "sky/shell/platform/android/platform_service_provider_android.h"
+#include "sky/shell/platform/android/platform_view_android.h"
+#include "sky/shell/platform/android/sky_main.h"
+#include "sky/shell/platform/android/tracing_controller.h"
+#include "sky/shell/platform/android/update_service_android.h"
 
 namespace {
 

sky/shell/android/platform_service_provider_android.cc → sky/shell/platform/android/platform_service_provider_android.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/android/platform_service_provider_android.h"
+#include "sky/shell/platform/android/platform_service_provider_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/bind.h"

sky/shell/android/platform_view_android.cc → sky/shell/platform/android/platform_view_android.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/android/platform_view_android.h"
+#include "sky/shell/platform/android/platform_view_android.h"
 
 #include <android/input.h>
 #include <android/native_window_jni.h>

sky/shell/android/sky_main.cc → sky/shell/platform/android/sky_main.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/android/sky_main.h"
+#include "sky/shell/platform/android/sky_main.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"

sky/shell/android/tracing_controller.cc → sky/shell/platform/android/tracing_controller.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/android/tracing_controller.h"
+#include "sky/shell/platform/android/tracing_controller.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"

sky/shell/android/update_service_android.cc → sky/shell/platform/android/update_service_android.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/android/update_service_android.h"
+#include "sky/shell/platform/android/update_service_android.h"
 
 #include "base/logging.h"
 #include "base/task_runner_util.h"

sky/shell/ios/main_ios.mm → sky/shell/platform/ios/main_ios.mm

@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #import <UIKit/UIKit.h>
-#import "sky/shell/ios/sky_app_delegate.h"
+#import "sky/shell/platform/ios/sky_app_delegate.h"
 
-#include "sky/shell/mac/platform_mac.h"
+#include "sky/shell/platform/mac/platform_mac.h"
 
 extern "C" {
 // TODO(csg): HACK! boringssl accesses this on Android using a weak symbol

sky/shell/ios/sky_surface.mm → sky/shell/platform/ios/sky_surface.mm

@@ -12,7 +12,7 @@
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "sky/services/engine/input_event.mojom.h"
 #include "sky/services/pointer/pointer.mojom.h"
-#include "sky/shell/mac/platform_view_mac.h"
+#include "sky/shell/platform/mac/platform_view_mac.h"
 #include "sky/shell/shell_view.h"
 #include "sky/shell/shell.h"
 #include "sky/shell/ui_delegate.h"

sky/shell/mac/main_mac.mm → sky/shell/platform/mac/main_mac.mm

@@ -7,8 +7,8 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
-#include "sky/shell/mac/platform_mac.h"
-#include "sky/shell/mac/sky_application.h"
+#include "sky/shell/platform/mac/platform_mac.h"
+#include "sky/shell/platform/mac/sky_application.h"
 #include "sky/shell/switches.h"
 #include "sky/shell/testing/testing.h"
 

sky/shell/mac/platform_mac.mm → sky/shell/platform/mac/platform_mac.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/mac/platform_mac.h"
+#include "sky/shell/platform/mac/platform_mac.h"
 
 #include <asl.h>
 #include "base/at_exit.h"

sky/shell/mac/platform_view_mac.mm → sky/shell/platform/mac/platform_view_mac.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/mac/platform_view_mac.h"
+#include "sky/shell/platform/mac/platform_view_mac.h"
 
 namespace sky {
 namespace shell {

sky/shell/mac/sky_application.mm → sky/shell/platform/mac/sky_application.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/mac/sky_application.h"
+#include "sky/shell/platform/mac/sky_application.h"
 
 #include "base/auto_reset.h"
 #include "base/logging.h"

sky/shell/mac/sky_window.mm → sky/shell/platform/mac/sky_window.mm

@@ -8,7 +8,7 @@
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "sky/services/engine/input_event.mojom.h"
 #include "sky/services/pointer/pointer.mojom.h"
-#include "sky/shell/mac/platform_view_mac.h"
+#include "sky/shell/platform/mac/platform_view_mac.h"
 #include "sky/shell/shell_view.h"
 #include "sky/shell/shell.h"
 #include "sky/shell/switches.h"