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

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 27df9071ae3bbe02233e5cbee84896bb59a5a99c..a0d59d7f54a6655de39d788a35d7a68be6cd3299 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -80,7 +80,9 @@
 #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
 
@@ -91,7 +93,7 @@
 
 #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"
@@ -107,7 +109,7 @@
 #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"
@@ -194,7 +196,9 @@ content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
   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;
@@ -209,7 +213,7 @@ RenderWidgetHostView* ChromeContentBrowserClient::CreateViewForWidget(
   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);
@@ -222,7 +226,7 @@ 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);