From 8a0cc5859cdaf1d7cc49c989b7ca2d2e39d02a3b Mon Sep 17 00:00:00 2001
From: Rene Ladan <rene@FreeBSD.org>
Date: Fri, 2 May 2014 10:15:13 +0000
Subject: Update to 34.0.1847.132

Obtained from:	https://github.com/gliaskos/freebsd-chromium/
MFH:		2014Q2
Security:	http://vuxml.org/freebsd/7cf25a0c-d031-11e3-947b-00262d5ed8ee.html
		http://vuxml.org/freebsd/963413a5-bf50-11e3-a2d6-00262d5ed8ee.html
---
 .../patch-chrome__app__chrome_main_delegate.cc     | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'www/chromium/files/patch-chrome__app__chrome_main_delegate.cc')

diff --git a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
index f93d59ccd4b8..fceb46b86668 100644
--- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
+++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig	2014-02-20 21:27:29.000000000 +0100
-+++ chrome/app/chrome_main_delegate.cc	2014-02-25 01:39:55.000000000 +0100
-@@ -97,7 +97,7 @@
+--- ./chrome/app/chrome_main_delegate.cc.orig	2014-04-24 22:34:55.000000000 +0200
++++ ./chrome/app/chrome_main_delegate.cc	2014-04-24 23:23:42.000000000 +0200
+@@ -95,7 +95,7 @@
  #include "ui/base/x/x11_util.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "components/breakpad/app/breakpad_linux.h"
  #endif
  
-@@ -115,7 +115,7 @@
+@@ -121,7 +121,7 @@
      g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
  #endif
  
@@ -18,16 +18,16 @@
  base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky
      g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER;
  #endif
-@@ -235,7 +235,7 @@
-       // Mac needs them for the plugin process name.
-       process_type == switches::kPluginProcess ||
+@@ -243,7 +243,7 @@
+       // Needed for scrollbar related images.
+       process_type == switches::kWorkerProcess ||
  #endif
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
        // The zygote process opens the resources for the renderers.
        process_type == switches::kZygoteProcess ||
  #endif
-@@ -392,7 +392,7 @@
+@@ -457,7 +457,7 @@
        std::string format_str =
            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
        if (format_str == "machine") {
@@ -36,7 +36,7 @@
        } else if (format_str == "log") {
          format = diagnostics::DiagnosticsWriter::LOG;
        } else {
-@@ -433,7 +433,7 @@
+@@ -498,7 +498,7 @@
        std::string format_str =
            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
        if (format_str == "machine") {
@@ -45,7 +45,7 @@
        } else if (format_str == "human") {
          format = diagnostics::DiagnosticsWriter::HUMAN;
        } else {
-@@ -564,7 +564,7 @@
+@@ -629,7 +629,7 @@
    std::string process_type =
        command_line.GetSwitchValueASCII(switches::kProcessType);
  
@@ -54,7 +54,7 @@
    breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer());
  #endif
  
-@@ -703,7 +703,7 @@
+@@ -747,7 +747,7 @@
  #endif
    }
  
@@ -63,7 +63,7 @@
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess) {
  #if defined(OS_ANDROID)
-@@ -715,7 +715,7 @@
+@@ -759,7 +759,7 @@
      breakpad::InitCrashReporter(process_type);
  #endif  // defined(OS_ANDROID)
    }
@@ -72,7 +72,7 @@
  
    // After all the platform Breakpads have been initialized, store the command
    // line for crash reporting.
-@@ -800,7 +800,7 @@
+@@ -844,7 +844,7 @@
    return process_type == switches::kNaClLoaderProcess ||
        process_type == switches::kRelauncherProcess;
  }
-- 
cgit v1.2.3