ui/gfx: Fix the file names of "canvas_skia_*" to say just "canvas_platform".

BUG=116572
R=asvitkine@chromium.org
TBR=sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9719018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127369 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 13 insertions, 13 deletions

diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas.cc
index 68087ba..68087ba 100644
--- a/ui/gfx/canvas_skia.cc
+++ b/ui/gfx/canvas.cc
diff --git a/ui/gfx/canvas_skia_android.cc b/ui/gfx/canvas_android.cc
index 9a6d7f1..9a6d7f1 100644
--- a/ui/gfx/canvas_skia_android.cc
+++ b/ui/gfx/canvas_android.cc
diff --git a/ui/gfx/canvas_skia_linux.cc b/ui/gfx/canvas_linux.cc
index 86b6d8e..86b6d8e 100644
--- a/ui/gfx/canvas_skia_linux.cc
+++ b/ui/gfx/canvas_linux.cc
diff --git a/ui/gfx/canvas_skia_mac.mm b/ui/gfx/canvas_mac.mm
index 5230a1d..5230a1d 100644
--- a/ui/gfx/canvas_skia_mac.mm
+++ b/ui/gfx/canvas_mac.mm
diff --git a/ui/gfx/canvas_skia_win.cc b/ui/gfx/canvas_win.cc
index 5d071fb..5d071fb 100644
--- a/ui/gfx/canvas_skia_win.cc
+++ b/ui/gfx/canvas_win.cc
diff --git a/ui/ui.gyp b/ui/ui.gyp
index f54abc2..51d340a5 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -256,16 +256,16 @@
         'gfx/blit.cc',
         'gfx/blit.h',
         'gfx/brush.h',
+        'gfx/canvas.cc',
         'gfx/canvas.h',
+        'gfx/canvas_android.cc',
+        'gfx/canvas_linux.cc',
+        'gfx/canvas_mac.mm',
         'gfx/canvas_paint.h',
         'gfx/canvas_paint_win.cc',
-        'gfx/canvas_skia.cc',
-        'gfx/canvas_skia_android.cc',
-        'gfx/canvas_skia_linux.cc',
-        'gfx/canvas_skia_mac.mm',
         'gfx/canvas_skia_paint.h',
         'gfx/canvas_skia_skia.cc',
-        'gfx/canvas_skia_win.cc',
+        'gfx/canvas_win.cc',
         'gfx/codec/jpeg_codec.cc',
         'gfx/codec/jpeg_codec.h',
         'gfx/codec/png_codec.cc',
@@ -374,14 +374,14 @@
         'ui_controls/ui_controls_win.cc',
       ],
       'conditions': [
-        # TODO(asvitkine): Switch all platforms to use_canvas_skia_skia.cc.
+        # TODO(asvitkine): Switch all platforms to use canvas_skia_skia.cc.
         #                  http://crbug.com/105550
         ['use_canvas_skia_skia==1', {
           'sources!': [
-            'gfx/canvas_skia_android.cc',
-            'gfx/canvas_skia_linux.cc',
-            'gfx/canvas_skia_mac.mm',
-            'gfx/canvas_skia_win.cc',
+            'gfx/canvas_android.cc',
+            'gfx/canvas_linux.cc',
+            'gfx/canvas_mac.mm',
+            'gfx/canvas_win.cc',
           ],
         }, {  # use_canvas_skia_skia!=1
           'sources!': [
diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc
index fb6b6d6..2445bd4 100644
--- a/ui/views/controls/label_unittest.cc
+++ b/ui/views/controls/label_unittest.cc
@@ -216,7 +216,7 @@ TEST(LabelTest, MultiLineSizing) {
   label.SizeToFit(required_width - 1);
   int constrained_width = label.GetLocalBounds().width();
 #if defined(OS_WIN)
-  // Canvas::SizeStringInt (in ui/gfx/canvas_skia_linux.cc)
+  // Canvas::SizeStringInt (in ui/gfx/canvas_linux.cc)
   // has to be fixed to return the size that fits to given width/height.
   EXPECT_LT(constrained_width, required_width);
 #endif
@@ -231,7 +231,7 @@ TEST(LabelTest, MultiLineSizing) {
   EXPECT_GT(required_height, kMinTextDimension);
   int height_for_constrained_width = label.GetHeightForWidth(constrained_width);
 #if defined(OS_WIN)
-  // Canvas::SizeStringInt (in ui/gfx/canvas_skia_linux.cc)
+  // Canvas::SizeStringInt (in ui/gfx/canvas_linux.cc)
   // has to be fixed to return the size that fits to given width/height.
   EXPECT_GT(height_for_constrained_width, required_height);
 #endif
@@ -263,7 +263,7 @@ TEST(LabelTest, MultiLineSizing) {
   // is shrunk.
   int height1 = label.GetHeightForWidth(required_width_with_border - 1);
 #if defined(OS_WIN)
-  // Canvas::SizeStringInt (in ui/gfx/canvas_skia_linux.cc)
+  // Canvas::SizeStringInt (in ui/gfx/canvas_linux.cc)
   // has to be fixed to return the size that fits to given width/height.
   EXPECT_GT(height1, required_height_with_border);
 #endif