Replace TabContentsViewGtk with TabContentsViewViews as part of the ongoing

gfx/canvas_direct2d.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GFX_CANVAS_DIRECT2D_H_
 #define GFX_CANVAS_DIRECT2D_H_
 #pragma once
 
 #include <d2d1.h>
 
@@ skipping 15 matching lines @@
 
   // Overridden from Canvas:
   virtual void Save();
   virtual void SaveLayerAlpha(uint8 alpha);
   virtual void SaveLayerAlpha(uint8 alpha, const gfx::Rect& layer_bounds);
   virtual void Restore();
   virtual bool ClipRectInt(int x, int y, int w, int h);
   virtual void TranslateInt(int x, int y);
   virtual void ScaleInt(int x, int y);
   virtual void FillRectInt(const SkColor& color, int x, int y, int w, int h);
+  virtual void FillRectInt(const SkColor& color, int x, int y, int w, int h,
+                           SkXfermode::Mode mode);
   virtual void FillRectInt(const gfx::Brush* brush, int x, int y, int w, int h);
   virtual void DrawRectInt(const SkColor& color, int x, int y, int w, int h);
   virtual void DrawRectInt(const SkColor& color,
                            int x, int y, int w, int h,
                            SkXfermode::Mode mode);
   virtual void DrawRectInt(int x, int y, int w, int h, const SkPaint& paint);
   virtual void DrawLineInt(const SkColor& color,
                            int x1, int y1,
                            int x2, int y2);
   virtual void DrawBitmapInt(const SkBitmap& bitmap, int x, int y);
@@ skipping 55 matching lines @@
     int clip_count;
   };
   std::stack<RenderState> state_;
 
   DISALLOW_COPY_AND_ASSIGN(CanvasDirect2D);
 };
 
 }  // namespace gfx;
 
 #endif  // GFX_CANVAS_DIRECT2D_H_