Cleanup VulkanWindowContext for use on Android

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2058763002

Review-Url: https://codereview.chromium.org/2058763002

tools/viewer/Viewer.h

@@ -13,6 +13,7 @@
 #include "sk_app/Window.h"
 #include "gm.h"
 #include "SkAnimTimer.h"
+#include "SkTouchGesture.h"
 #include "Slide.h"
 
 class SkCanvas;

tools/viewer/sk_app/VulkanWindowContext.h

@@ -8,6 +8,8 @@
 #ifndef VulkanWindowContext_DEFINED
 #define VulkanWindowContext_DEFINED
 
+#include "SkTypes.h" // required to pull in any SkUserConfig defines
+
 #ifdef SK_VULKAN
 
 #include "vk/GrVkBackendContext.h"

tools/viewer/sk_app/android/VulkanWindowContext_android.cpp

@@ -6,8 +6,8 @@
  * found in the LICENSE file.
  */
 
-#include "Window_android.h"
 #include "../VulkanWindowContext.h"
+#include "WindowContext_android.h"
 
 #include "vk/GrVkInterface.h"
 #include "vk/GrVkUtil.h"

tools/viewer/sk_app/android/WindowContext_android.h

@@ -0,0 +1,21 @@
+/*
+* Copyright 2016 Google Inc.
+*
+* Use of this source code is governed by a BSD-style license that can be
+* found in the LICENSE file.
+*/
+
+#ifndef WindowContext_android_DEFINED
+#define WindowContext_android_DEFINED
+
+#include <android/native_window_jni.h>
+
+namespace sk_app {
+
+struct ContextPlatformData_android {
+    ANativeWindow* fNativeWindow;
+};
+
+}   // namespace sk_app
+
+#endif // WindowContext_android_DEFINED

tools/viewer/sk_app/android/Window_android.h

@@ -8,17 +8,12 @@
 #ifndef Window_android_DEFINED
 #define Window_android_DEFINED
 
-#include <android/native_window_jni.h>
-
 #include "../Window.h"
+#include "WindowContext_android.h"
 #include "surface_glue_android.h"
 
 namespace sk_app {
 
-struct ContextPlatformData_android {
-    ANativeWindow* fNativeWindow;
-};
-
 class Window_android : public Window {
 public:
     Window_android() : Window() {}