Move animated view headers to correct directory.

git-svn-id: http://skia.googlecode.com/svn/trunk@4524 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/gyp/views.gyp b/gyp/views.gyp
index f3d3759..fa0a29a 100644 (file)
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -26,10 +26,8 @@
       'sources': [
         '../include/views/SkApplication.h',
         '../include/views/SkBGViewArtist.h',
-        '../include/views/SkBorderView.h',
         '../include/views/SkEvent.h',
         '../include/views/SkEventSink.h',
-        '../include/views/SkImageView.h',
         '../include/views/SkKey.h',
         '../include/views/SkOSMenu.h',
         '../include/views/SkOSWindow_Mac.h',
@@ -37,8 +35,6 @@
         '../include/views/SkOSWindow_Unix.h',
         '../include/views/SkOSWindow_Win.h',
         #'../include/views/SkOSWindow_wxwidgets.h',
-        '../include/views/SkProgressBarView.h',
-        '../include/views/SkScrollBarView.h',
         '../include/views/SkStackViewLayout.h',
         '../include/views/SkSystemEventTypes.h',
         '../include/views/SkTextBox.h',
@@ -51,7 +47,6 @@
         '../src/views/SkBGViewArtist.cpp',
         '../src/views/SkEvent.cpp',
         '../src/views/SkEventSink.cpp',
-        '../src/views/SkListView.cpp',
         '../src/views/SkOSMenu.cpp',
         '../src/views/SkParsePaint.cpp',
         '../src/views/SkProgressView.cpp',

diff --git a/gyp/views_animated.gyp b/gyp/views_animated.gyp
index f7cd052..90d5351 100644 (file)
--- a/gyp/views_animated.gyp
+++ b/gyp/views_animated.gyp
@@ -18,10 +18,15 @@
         '../include/views/animated',
       ],
       'sources': [
+        '../include/views/animated/SkBorderView.h',
+        '../include/views/animated/SkImageView.h',
+        '../include/views/animated/SkProgressBarView.h',
+        '../include/views/animated/SkScrollBarView.h',
         '../include/views/animated/SkWidgetViews.h',
 
         '../src/views/animated/SkBorderView.cpp',
         '../src/views/animated/SkImageView.cpp',
+        '../src/views/animated/SkListView.cpp',
         '../src/views/animated/SkListWidget.cpp',
         '../src/views/animated/SkProgressBarView.cpp',
         '../src/views/animated/SkScrollBarView.cpp',

diff --git a/include/views/SkBorderView.h b/include/views/animated/SkBorderView.h
similarity index 100%
rename from include/views/SkBorderView.h
rename to include/views/animated/SkBorderView.h

diff --git a/include/views/SkImageView.h b/include/views/animated/SkImageView.h
similarity index 100%
rename from include/views/SkImageView.h
rename to include/views/animated/SkImageView.h

diff --git a/include/views/SkProgressBarView.h b/include/views/animated/SkProgressBarView.h
similarity index 100%
rename from include/views/SkProgressBarView.h
rename to include/views/animated/SkProgressBarView.h

diff --git a/include/views/SkScrollBarView.h b/include/views/animated/SkScrollBarView.h
similarity index 100%
rename from include/views/SkScrollBarView.h
rename to include/views/animated/SkScrollBarView.h

diff --git a/src/views/SkListView.cpp b/src/views/animated/SkListView.cpp
similarity index 100%
rename from src/views/SkListView.cpp
rename to src/views/animated/SkListView.cpp