Fix various Mac and Linux compile errors.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@114 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

libcef/browser_impl.cc

@@ -771,7 +771,9 @@ CefRefPtr<CefBrowserImpl> CefBrowserImpl::UIT_CreatePopupWindow(const std::wstri
   REQUIRE_UIT();
     
   CefWindowInfo info;
+#if defined(OS_WIN)
   info.SetAsPopup(NULL, url.c_str());
+#endif
   CefRefPtr<CefHandler> handler = handler_;
   std::wstring newUrl = url;
 

libcef/browser_impl.h

@@ -112,7 +112,7 @@ public:
   BrowserWebViewDelegate* GetWebViewDelegate() const {
     return delegate_.get();
   }
-  HWND GetWebViewWndHandle() const {
+  CefWindowHandle GetWebViewWndHandle() const {
     return webviewhost_->view_handle();
   }
   WebKit::WebWidget* GetPopup() const {
@@ -124,11 +124,15 @@ public:
   BrowserWebViewDelegate* GetPopupDelegate() const {
     return popup_delegate_.get();
   }
-  HWND GetPopupWndHandle() const {
+  CefWindowHandle GetPopupWndHandle() const {
     return popuphost_->view_handle();
   }
-  HWND GetMainWndHandle() const {
+  CefWindowHandle GetMainWndHandle() const {
+#if defined(OS_WIN)
     return window_info_.m_hWnd;
+#else
+    return 0;
+#endif
   }
 
 
@@ -247,8 +251,10 @@ protected:
 
   std::wstring title_;
 
+#if defined(OS_WIN)
   // Context object used to manage printing.
   printing::PrintingContext print_context_;
+#endif
 
   typedef std::map<std::wstring, CefFrame*> FrameMap;
   FrameMap frames_;

libcef/browser_webkit_glue.cc

@@ -20,7 +20,6 @@ MSVC_POP_WARNING();
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
-#include "base/win_util.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"