From 105ad369abfdfa594e38f75f0a43898850098481 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 14 Mar 2015 18:54:02 +0000
Subject: [PATCH] linux: Fix compilation error

---
 atom/browser/atom_browser_main_parts.cc                       | 2 +-
 .../chrome/renderer/printing/print_web_view_helper_linux.cc   | 4 ++--
 .../chrome/renderer/printing/print_web_view_helper_pdf_win.cc | 2 +-
 vendor/brightray                                              | 2 +-
 vendor/native_mate                                            | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/atom/browser/atom_browser_main_parts.cc b/atom/browser/atom_browser_main_parts.cc
index 8d05a34780d..bcf685e6e3a 100644
--- a/atom/browser/atom_browser_main_parts.cc
+++ b/atom/browser/atom_browser_main_parts.cc
@@ -93,7 +93,7 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
   brightray::BrowserMainParts::PreMainMessageLoopRun();
 
 #if defined(USE_X11)
-  libgtk2ui::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
+  libgtk2ui::GtkInitFromCommandLine(*base::CommandLine::ForCurrentProcess());
 #endif
 
 #if !defined(OS_MACOSX)
diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc
index c35acd5b8e7..1fb3b260e0b 100644
--- a/chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc
+++ b/chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc
@@ -131,7 +131,7 @@ void PrintWebViewHelper::PrintPageInternal(
   gfx::Rect canvas_area = content_area;
 
   skia::PlatformCanvas* canvas = metafile->GetVectorCanvasForNewPage(
-        *page_size, canvas_area, scale_factor);
+      page_size, canvas_area, scale_factor);
   if (!canvas)
     return;
 
@@ -139,7 +139,7 @@ void PrintWebViewHelper::PrintPageInternal(
   skia::SetIsDraftMode(*canvas, is_print_ready_metafile_sent_);
 
   RenderPageContent(frame, params.page_number, canvas_area, content_area,
-                    scale_factor, canvas.get());
+                    scale_factor, canvas);
 
   // Done printing. Close the device context to retrieve the compiled metafile.
   if (!metafile->FinishPage())
diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
index 0e82eb7606e..c4bd9648905 100644
--- a/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
+++ b/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
@@ -210,7 +210,7 @@ void PrintWebViewHelper::PrintPageInternal(
                                                 canvas_area,
                                                 content_area,
                                                 scale_factor,
-                                                canvas.get());
+                                                canvas);
   DCHECK_GT(webkit_scale_factor, 0.0f);
   // Done printing. Close the device context to retrieve the compiled metafile.
   if (!metafile->FinishPage())
diff --git a/vendor/brightray b/vendor/brightray
index 5493d5f8bde..4670aeb7104 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 5493d5f8bde6226c051f766d2068aea118528da7
+Subproject commit 4670aeb7104172f9d22f02c8621a586d984055c6
diff --git a/vendor/native_mate b/vendor/native_mate
index a636fad51e8..38aba072908 160000
--- a/vendor/native_mate
+++ b/vendor/native_mate
@@ -1 +1 @@
-Subproject commit a636fad51e862d52c7bdb527c91300c85ed3c254
+Subproject commit 38aba072908357b4eebc68462714b01a9c2d0138