3 files changed, 6 insertions, 1 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 09755c9d..b24076f 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -406,4 +406,7 @@ const wchar_t kEnableOutOfProcessDevTools[]    = L"enable-oop-devtools";
 // Enable HTML5 Worker support
 const wchar_t kEnableWebWorkers[]              = L"enable-web-workers";
 
+// Enables experimental views under gtk.
+const wchar_t kViewsGtk[] = L"views-gtk";
+
 }  // namespace switches
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index ea5909b..a958bc9 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -157,6 +157,8 @@ extern const wchar_t kEnableOutOfProcessDevTools[];
 
 extern const wchar_t kEnableWebWorkers[];
 
+extern const wchar_t kViewsGtk[];
+
 }  // namespace switches
 
 #endif  // CHROME_COMMON_CHROME_SWITCHES_H__
diff --git a/chrome/common/gfx/chrome_canvas.h b/chrome/common/gfx/chrome_canvas.h
index 0a44fab..cf6db1e 100644
--- a/chrome/common/gfx/chrome_canvas.h
+++ b/chrome/common/gfx/chrome_canvas.h
@@ -188,7 +188,7 @@ class ChromeCanvas : public skia::PlatformCanvas {
   DISALLOW_EVIL_CONSTRUCTORS(ChromeCanvas);
 };
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
 typedef skia::CanvasPaintT<ChromeCanvas> ChromeCanvasPaint;
 #endif