OpenBSD patches for chrome/content, split from CR #8275005

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include "base/command_line.h"
 #include "chrome/app/breakpad_mac.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 62 matching lines @@
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 #elif defined(USE_AURA)
 #include "chrome/browser/chrome_browser_main_aura.h"
 #elif defined(OS_WIN)
 #include "chrome/browser/chrome_browser_main_win.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/chrome_browser_main_mac.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"

[stevenjb, 2011/10/19 17:50:48]

CHROMEOS is already define at the top of this list.

[Robert Nagy, 2011/10/19 20:17:49]

Done.

+#elif defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chrome_browser_main_gtk.h"
 #endif
 
 #if defined(OS_LINUX)
 #include "base/linux_util.h"
 #include "chrome/browser/crash_handler_host_linux.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
-#elif defined(OS_LINUX)
+#elif defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/tab_contents/tab_contents_view_mac.h"
 #endif
 
 #if defined(USE_NSS)
 #include "chrome/browser/ui/crypto_module_password_dialog.h"
 #endif
 
 
 #if defined(USE_AURA) || defined(TOUCH_UI)
 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
 #elif defined(OS_WIN)
 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
 #include "content/browser/renderer_host/render_widget_host_view_win.h"
-#elif defined(OS_LINUX)
+#elif defined(TOOLKIT_USES_GTK)
 #include "content/browser/renderer_host/render_widget_host_view_gtk.h"
 #elif defined(OS_MACOSX)
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
 #endif
 
 namespace {
 
 // Handles rewriting Web UI URLs.
 bool HandleWebUI(GURL* url, content::BrowserContext* browser_context) {
   if (!ChromeWebUIFactory::GetInstance()->UseWebUIForURL(browser_context, *url))
@@ skipping 66 matching lines @@
 content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
     const MainFunctionParams& parameters) {
 #if defined(OS_CHROMEOS)
   return new ChromeBrowserMainPartsChromeos(parameters);
 #elif defined(USE_AURA)
   return new ChromeBrowserMainPartsAura(parameters);
 #elif defined(OS_WIN)
   return new ChromeBrowserMainPartsWin(parameters);
 #elif defined(OS_MACOSX)
   return new ChromeBrowserMainPartsMac(parameters);
-#elif defined(OS_LINUX)
+#elif defined(OS_CHROMEOS)

[stevenjb, 2011/10/19 17:50:48]

CHROMEOS is already define at the top of this list.

[Robert Nagy, 2011/10/19 20:17:49]

Done.

+  return new ChromeBrowserMainPartsChromeos(parameters);
+#elif defined(TOOLKIT_USES_GTK)
   return new ChromeBrowserMainPartsGtk(parameters);
 #else
   return NULL;
 #endif
 }
 
 RenderWidgetHostView* ChromeContentBrowserClient::CreateViewForWidget(
     RenderWidgetHost* widget) {
 #if defined(USE_AURA) || defined(TOUCH_UI)
   return new RenderWidgetHostViewViews(widget);
 #elif defined(OS_WIN)
   if (views::Widget::IsPureViews())
     return new RenderWidgetHostViewViews(widget);
   return new RenderWidgetHostViewWin(widget);
-#elif defined(OS_LINUX)
+#elif defined(TOOLKIT_USES_GTK)
   return new RenderWidgetHostViewGtk(widget);
 #elif defined(OS_MACOSX)
   return render_widget_host_view_mac::CreateRenderWidgetHostView(widget);
 #else
 #error Need to create your platform ViewForWidget here.
 #endif
 }
 
 TabContentsView* ChromeContentBrowserClient::CreateTabContentsView(
     TabContents* tab_contents) {
 #if defined(TOOLKIT_VIEWS)
   return new TabContentsViewViews(tab_contents);
-#elif defined(OS_LINUX)
+#elif defined(TOOLKIT_USES_GTK)
   return new TabContentsViewGtk(tab_contents);
 #elif defined(OS_MACOSX)
   return tab_contents_view_mac::CreateTabContentsView(tab_contents);
 #else
 #error Need to create your platform TabContentsView here.
 #endif
 }
 
 void ChromeContentBrowserClient::RenderViewHostCreated(
     RenderViewHost* render_view_host) {
@@ skipping 709 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome