Rename VulkanViewer to Viewer, take 2.

tools/viewer/android/Window_android.cpp

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include "Window_android.h"
 
 #include "VulkanTestContext_android.h"
 
+namespace sk_app {
+
 Window* Window::CreateNativeWindow(void* platformData) {
     Window_android* window = new Window_android();
     if (!window->init((android_app*)platformData)) {
         delete window;
         return nullptr;
     }
     return window;
 }
 
 static void handle_cmd(struct android_app* app, int32_t cmd);
@@ skipping 32 matching lines @@
     fTestContext = VulkanTestContext::Create((void*)&platformData, mSampleCount);
 }
 
 static void android_app_write_cmd(struct android_app* android_app, int8_t cmd) {
     if (write(android_app->msgwrite, &cmd, sizeof(cmd)) != sizeof(cmd)) {
         SkDebugf("Failure writing android_app cmd: %s\n", strerror(errno));
     }
 }
 
 void Window_android::inval() {
-        android_app_write_cmd(mApp, APP_CMD_INVAL_WINDOW);
+    android_app_write_cmd(mApp, APP_CMD_INVAL_WINDOW);
 }
 
 void Window_android::paintIfNeeded() {
     if (mApp->window || !mContentRect.isEmpty()) {
         this->onPaint();
     }
 }
 
 /**
  * Process the next main command.
@@ skipping 67 matching lines @@
         int32_t fWindowModifier;
     } gPair[] = {
         { AMETA_SHIFT_ON, Window::kShift_ModifierKey },
         { AMETA_CTRL_ON, Window::kControl_ModifierKey },
     };
 
     int32_t metaState = AKeyEvent_getMetaState(event);
     int32_t modifiers = 0;
 
     if (AKeyEvent_getRepeatCount(event) == 0) {
-        modifiers |= Window::kFirstPress_ModifierKey;
+        modifiers |= Window::kFirstPress_ModifierKey;
     }
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(gPair); i++) {
         if (gPair[i].fAndroidState == metaState) {
             modifiers |= gPair[i].fWindowModifier;
         }
     }
     return modifiers;
 }
 
 /**
  * Process the next input event.
  */
 static int32_t handle_input(struct android_app* app, AInputEvent* event) {
     Window_android* window = (Window_android*)app->userData;
     switch(AInputEvent_getType(event)) {
         case AINPUT_EVENT_TYPE_MOTION:
             break;
         case AINPUT_EVENT_TYPE_KEY:
             Window::Key key = get_key(AKeyEvent_getKeyCode(event));
             Window::InputState state = get_action(AKeyEvent_getAction(event));
             int32_t mod = get_key_modifiers(event);
             window->onKey(key, state, mod);
             return true; // eat all key events
     }
     return 0;
 }
+
+}   // namespace sk_app