diff options
| -rw-r--r-- | chrome/browser/about_flags.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/component_updater/component_updater_configurator.cc | 8 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 14 | ||||
| -rw-r--r-- | content/browser/renderer_host/pepper_message_filter.cc | 3 |
5 files changed, 26 insertions, 13 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 0be5d79..19780ef 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -672,7 +672,7 @@ int GetCurrentPlatform() { return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_OPENBSD) return kOsLinux; #else #error Unknown platform diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index b5e0f6c..ccc45ba 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -82,7 +82,7 @@ #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(TOOLKIT_USES_GTK) #include "chrome/browser/chrome_browser_main_gtk.h" #endif @@ -93,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" @@ -109,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" @@ -200,7 +200,7 @@ content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts( return new ChromeBrowserMainPartsWin(parameters); #elif defined(OS_MACOSX) return new ChromeBrowserMainPartsMac(parameters); -#elif defined(OS_LINUX) +#elif defined(TOOLKIT_USES_GTK) return new ChromeBrowserMainPartsGtk(parameters); #else return NULL; @@ -215,7 +215,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); @@ -228,7 +228,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); diff --git a/chrome/browser/component_updater/component_updater_configurator.cc b/chrome/browser/component_updater/component_updater_configurator.cc index aff33e7..7588192 100644 --- a/chrome/browser/component_updater/component_updater_configurator.cc +++ b/chrome/browser/component_updater/component_updater_configurator.cc @@ -73,6 +73,14 @@ const char kExtraInfo[] = #else "os=linux&arch=unknown&prod=chrome&prodversion="; #endif +#elif defined(OS_OPENBSD) + #if defined(__amd64__) + "os=openbsd&arch=x64"; + #elif defined(__i386__) + "os=openbsd&arch=x86"; + #else + "os=openbsd&arch=unknown"; + #endif #else #error "unknown os or architecture" #endif diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 28cb4d0..b251337 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -4273,12 +4273,6 @@ '../dbus/dbus.gyp:dbus', '../third_party/undoview/undoview.gyp:undoview', ], - 'link_settings': { - 'libraries': [ - # For dlsym() in 'browser/zygote_main_linux.cc' - '-ldl', - ], - }, 'sources!': [ 'browser/ui/views/extensions/extension_view.cc', 'browser/ui/views/extensions/extension_view.h', @@ -4288,6 +4282,14 @@ 'browser/first_run/upgrade_util.h', ], 'conditions': [ + ['OS=="linux"', { + 'link_settings': { + 'libraries': [ + # For dlsym() in 'browser/zygote_main_linux.cc' + '-ldl', + ], + }, + }], ['use_gnome_keyring==1', { 'dependencies': [ '../build/linux/system.gyp:gnome_keyring', diff --git a/content/browser/renderer_host/pepper_message_filter.cc b/content/browser/renderer_host/pepper_message_filter.cc index 103af33..3cc90ce 100644 --- a/content/browser/renderer_host/pepper_message_filter.cc +++ b/content/browser/renderer_host/pepper_message_filter.cc @@ -130,10 +130,13 @@ bool NetAddressToAddressList(const PP_Flash_NetAddress& net_addr, } // namespace +// This assert fails on OpenBSD for an unknown reason at the moment. +#if !defined(OS_OPENBSD) // Make sure the storage in |PP_Flash_NetAddress| is big enough. (Do it here // since the data is opaque elsewhere.) COMPILE_ASSERT(sizeof(reinterpret_cast<PP_Flash_NetAddress*>(0)->data) >= sizeof(sockaddr_storage), PP_Flash_NetAddress_data_too_small); +#endif const PP_Flash_NetAddress kInvalidNetAddress = { 0 }; |