Revert "Move headers used by headers in include/ to include/private."

include/views/SkOSWindow_Win.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkOSWindow_Win_DEFINED
 #define SkOSWindow_Win_DEFINED
 
 #include "SkWindow.h"
-#include "../private/SkFunction.h"
-#include "../private/SkTHash.h"
+#include "../../src/core/SkFunction.h"
+#include "../../src/core/SkTHash.h"
 
 #if SK_ANGLE
 #include "EGL/egl.h"
 #endif
 
 class SkOSWindow : public SkWindow {
 public:
     struct WindowInit {
         const TCHAR*    fClass;
         HINSTANCE       fInstance;
@@ skipping 98 matching lines @@
     bool attachANGLE(int msaaSampleCount, AttachmentInfo* info);
     void detachANGLE();
     void presentANGLE();
 #endif // SK_ANGLE
 #endif // SK_SUPPORT_GPU
 
     typedef SkWindow INHERITED;
 };
 
 #endif