www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc

   1 --- chrome/browser/chrome_content_browser_client.cc.orig        2016-05-11 19:02:13 UTC
   2 +++ chrome/browser/chrome_content_browser_client.cc
   3 @@ -191,7 +191,7 @@
   4  #include "chrome/browser/chromeos/system/input_device_settings.h"
   5  #include "chromeos/chromeos_switches.h"
   6  #include "components/user_manager/user_manager.h"
   7 -#elif defined(OS_LINUX)
   8 +#elif defined(OS_LINUX) || defined(OS_BSD)
   9  #include "chrome/browser/chrome_browser_main_linux.h"
  10  #elif defined(OS_ANDROID)
  11  #include "chrome/browser/chrome_browser_main_android.h"
  12 @@ -204,7 +204,7 @@
  13  #include "chrome/browser/chrome_browser_main_posix.h"
  14  #endif
  15
  16 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
  17 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
  18  #include "base/debug/leak_annotations.h"
  19  #include "components/crash/content/app/breakpad_linux.h"
  20  #include "components/crash/content/browser/crash_handler_host_linux.h"
  21 @@ -225,7 +225,7 @@
  22  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
  23  #endif
  24
  25 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
  26 +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
  27  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
  28  #endif
  29
  30 @@ -502,7 +502,7 @@ bool CertMatchesFilter(const net::X509Ce
  31    return false;
  32  }
  33
  34 -#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
  35 +#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
  36  breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
  37      const std::string& process_type) {
  38    base::FilePath dumps_path;
  39 @@ -782,7 +782,7 @@ content::BrowserMainParts* ChromeContent
  40    main_parts = new ChromeBrowserMainPartsMac(parameters);
  41  #elif defined(OS_CHROMEOS)
  42    main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters);
  43 -#elif defined(OS_LINUX)
  44 +#elif defined(OS_LINUX) || defined(OS_BSD)
  45    main_parts = new ChromeBrowserMainPartsLinux(parameters);
  46  #elif defined(OS_ANDROID)
  47    main_parts = new ChromeBrowserMainPartsAndroid(parameters);
  48 @@ -798,7 +798,7 @@ content::BrowserMainParts* ChromeContent
  49    // Construct additional browser parts. Stages are called in the order in
  50    // which they are added.
  51  #if defined(TOOLKIT_VIEWS)
  52 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
  53 +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
  54    main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
  55  #else
  56    main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
  57 @@ -1428,7 +1428,7 @@ void ChromeContentBrowserClient::AppendE
  58      command_line->AppendSwitchASCII(switches::kMetricsClientID,
  59                                      client_info->client_id);
  60    }
  61 -#elif defined(OS_POSIX)
  62 +#elif defined(OS_POSIX) && !defined(OS_BSD)
  63    if (breakpad::IsCrashReporterEnabled()) {
  64      std::string switch_value;
  65      scoped_ptr<metrics::ClientInfo> client_info =
  66 @@ -2637,7 +2637,7 @@ void ChromeContentBrowserClient::GetAddi
  67    PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path);
  68    DCHECK(!app_data_path.empty());
  69  }
  70 -#elif defined(OS_POSIX) && !defined(OS_MACOSX)
  71 +#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
  72  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
  73      const base::CommandLine& command_line,
  74      int child_process_id,