Rename DrawBitmapInt to DrawImageInt

Bug=None
Test=Compiles

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

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

5 files changed, 21 insertions, 21 deletions

diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc
index 8dcc4a3..c3028fc 100644
--- a/ash/desktop_background/desktop_background_view.cc
+++ b/ash/desktop_background/desktop_background_view.cc
@@ -103,7 +103,7 @@ void DesktopBackgroundView::OnPaint(gfx::Canvas* canvas) {
     }
 
     gfx::Rect wallpaper_cropped_rect = wallpaper_rect.Center(cropped_size);
-    canvas->DrawBitmapInt(wallpaper_,
+    canvas->DrawImageInt(wallpaper_,
         wallpaper_cropped_rect.x(), wallpaper_cropped_rect.y(),
         wallpaper_cropped_rect.width(), wallpaper_cropped_rect.height(),
         0, 0, width(), height(),
@@ -112,11 +112,11 @@ void DesktopBackgroundView::OnPaint(gfx::Canvas* canvas) {
     canvas->TileImageInt(wallpaper_, 0, 0, width(), height());
   } else if (wallpaper_layout_ == ash::STRETCH) {
     // This is generally not recommended as it may show artifacts.
-    canvas->DrawBitmapInt(wallpaper_, 0, 0, wallpaper_.width(),
+    canvas->DrawImageInt(wallpaper_, 0, 0, wallpaper_.width(),
         wallpaper_.height(), 0, 0, width(), height(), true);
   } else {
     // All other are simply centered, and not scaled (but may be clipped).
-     canvas->DrawBitmapInt(wallpaper_, (width() - wallpaper_.width()) / 2,
+     canvas->DrawImageInt(wallpaper_, (width() - wallpaper_.width()) / 2,
          (height() - wallpaper_.height()) / 2);
   }
 }
diff --git a/ash/launcher/tabbed_launcher_button.cc b/ash/launcher/tabbed_launcher_button.cc
index 398e210..4bee325 100644
--- a/ash/launcher/tabbed_launcher_button.cc
+++ b/ash/launcher/tabbed_launcher_button.cc
@@ -91,12 +91,12 @@ void TabbedLauncherButton::IconView::OnPaint(gfx::Canvas* canvas) {
     int x = (width() - animating_image_.width()) / 2;
     int y = (height() - animating_image_.height()) / 2;
     canvas->SaveLayerAlpha(animation_->CurrentValueBetween(255, 0));
-    canvas->DrawBitmapInt(animating_image_, x, y);
+    canvas->DrawImageInt(animating_image_, x, y);
     canvas->Restore();
   } else {
     int x = (width() - image_.width()) / 2;
     int y = (height() - image_.height()) / 2;
-    canvas->DrawBitmapInt(image_, x, y);
+    canvas->DrawImageInt(image_, x, y);
   }
 }
 
diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc
index 7623164..617b22ea 100644
--- a/ash/wm/frame_painter.cc
+++ b/ash/wm/frame_painter.cc
@@ -366,13 +366,13 @@ void FramePainter::PaintHeader(views::NonClientFrameView* view,
 
   // Draw the theme frame overlay, if available.
   if (theme_frame_overlay)
-    canvas->DrawBitmapInt(*theme_frame_overlay, 0, 0);
+    canvas->DrawImageInt(*theme_frame_overlay, 0, 0);
 
   // Separator between the maximize and close buttons.  It overlaps the left
   // edge of the close button.
-  canvas->DrawBitmapInt(*button_separator_,
-                        close_button_->x(),
-                        close_button_->y());
+  canvas->DrawImageInt(*button_separator_,
+                       close_button_->x(),
+                       close_button_->y());
 
   // We don't need the extra lightness in the edges when we're at the top edge
   // of the screen.
@@ -383,22 +383,22 @@ void FramePainter::PaintHeader(views::NonClientFrameView* view,
 
   // Draw the top corners and edge.
   int top_left_height = top_left_corner_->height();
-  canvas->DrawBitmapInt(*top_left_corner_,
-                        0, 0, top_left_corner_->width(), top_left_height,
-                        0, 0, top_left_corner_->width(), top_left_height,
-                        false);
+  canvas->DrawImageInt(*top_left_corner_,
+                       0, 0, top_left_corner_->width(), top_left_height,
+                       0, 0, top_left_corner_->width(), top_left_height,
+                       false);
   canvas->TileImageInt(*top_edge_,
       top_left_corner_->width(),
       0,
       view->width() - top_left_corner_->width() - top_right_corner_->width(),
       top_edge_->height());
   int top_right_height = top_right_corner_->height();
-  canvas->DrawBitmapInt(*top_right_corner_,
-                        0, 0,
-                        top_right_corner_->width(), top_right_height,
-                        view->width() - top_right_corner_->width(), 0,
-                        top_right_corner_->width(), top_right_height,
-                        false);
+  canvas->DrawImageInt(*top_right_corner_,
+                       0, 0,
+                       top_right_corner_->width(), top_right_height,
+                       view->width() - top_right_corner_->width(), 0,
+                       top_right_corner_->width(), top_right_height,
+                       false);
 
   // Header left edge.
   int header_left_height = theme_frame->height() - top_left_height;
diff --git a/ash/wm/image_grid.cc b/ash/wm/image_grid.cc
index 54ccca3..5b275e3 100644
--- a/ash/wm/image_grid.cc
+++ b/ash/wm/image_grid.cc
@@ -227,7 +227,7 @@ void ImageGrid::ImagePainter::SetClipRect(const gfx::Rect& clip_rect,
 void ImageGrid::ImagePainter::OnPaintLayer(gfx::Canvas* canvas) {
   if (!clip_rect_.IsEmpty())
     canvas->ClipRect(clip_rect_);
-  canvas->DrawBitmapInt(*(image_->ToImageSkia()), 0, 0);
+  canvas->DrawImageInt(*(image_->ToImageSkia()), 0, 0);
 }
 
 void ImageGrid::ImagePainter::OnDeviceScaleFactorChanged(
diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc
index 4b3ee2d..9ff22ea 100644
--- a/ash/wm/workspace/multi_window_resize_controller.cc
+++ b/ash/wm/workspace/multi_window_resize_controller.cc
@@ -75,7 +75,7 @@ class MultiWindowResizeController::ResizeView : public views::View {
     return gfx::Size(image_->width(), image_->height());
   }
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
-    canvas->DrawBitmapInt(*image_, 0, 0);
+    canvas->DrawImageInt(*image_, 0, 0);
   }
   virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE {
     gfx::Point location(event.location());