Bulk fixes to get Mac Test Shell more compile-happy.

webkit/tools/test_shell/test_webview_delegate.h

 // Copyright (c) 2006-2008 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.
 
 // TestWebViewDelegate class: 
 // This class implements the WebViewDelegate methods for the test shell.  One
 // instance is owned by each TestShell.
 
-#ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H__
-#define WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H__
+#ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_
+#define WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_
 
+#include "build/build_config.h"
+
+#if defined(OS_WIN)
 #include <windows.h>
+#endif
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "webkit/glue/webview_delegate.h"
 #include "webkit/glue/webwidget_delegate.h"
+#if defined(OS_WIN)
 #include "webkit/tools/test_shell/drag_delegate.h"
 #include "webkit/tools/test_shell/drop_delegate.h"
+#endif
 
 struct WebPreferences;
 class GURL;
 class TestShell;
 class WebDataSource;
 class WebWidgetHost;
 
-class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>, public WebViewDelegate {
+class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
+                            public WebViewDelegate {
  public:
   struct CapturedContextMenuEvent {
     CapturedContextMenuEvent(ContextNode::Type in_type,
                              int in_x,
                              int in_y)
       : type(in_type),
         x(in_x),
         y(in_y) {
     }
 
     ContextNode::Type type;
     int x;
     int y;
   };
 
   typedef std::vector<CapturedContextMenuEvent> CapturedContextMenuEvents;
 
   TestWebViewDelegate(TestShell* shell) 
     : shell_(shell),
       top_loading_frame_(NULL),
       page_id_(-1),
       last_page_id_updated_(-1),
       page_is_loading_(false),
-      is_custom_policy_delegate_(false),
-      custom_cursor_(NULL) { 
+      is_custom_policy_delegate_(false)
+#if defined(OS_WIN)
+      , custom_cursor_(NULL)
+#endif
+      { 
   }
   virtual ~TestWebViewDelegate();
 
   // WebViewDelegate
   virtual WebView* CreateWebView(WebView* webview, bool user_gesture);
   virtual WebWidget* CreatePopupWidget(WebView* webview);
   virtual WebPluginDelegate* CreatePluginDelegate(
     WebView* webview,
     const GURL& url,
     const std::string& mime_type,
@@ skipping 111 matching lines @@
     WebNavigationType type,
     WindowOpenDisposition disposition,
     bool is_redirect);
   void TestWebViewDelegate::SetCustomPolicyDelegate(bool isCustom);
   virtual WebHistoryItem* GetHistoryEntryAtOffset(int offset);
   virtual void GoToEntryAtOffsetAsync(int offset);
   virtual int GetHistoryBackListCount();
   virtual int GetHistoryForwardListCount();
 
   // WebWidgetDelegate
-  virtual HWND GetContainingWindow(WebWidget* webwidget);
+  virtual gfx::ViewHandle GetContainingWindow(WebWidget* webwidget);
   virtual void DidInvalidateRect(WebWidget* webwidget, const gfx::Rect& rect);
   virtual void DidScrollRect(WebWidget* webwidget, int dx, int dy,
                              const gfx::Rect& clip_rect);
   virtual void Show(WebWidget* webview, WindowOpenDisposition disposition);
   virtual void CloseWidgetSoon(WebWidget* webwidget);
   virtual void Focus(WebWidget* webwidget);
   virtual void Blur(WebWidget* webwidget);
   virtual void SetCursor(WebWidget* webwidget, 
                          const WebCursor& cursor);
   virtual void GetWindowRect(WebWidget* webwidget, gfx::Rect* rect);
   virtual void SetWindowRect(WebWidget* webwidget, const gfx::Rect& rect);
   virtual void GetRootWindowRect(WebWidget *,gfx::Rect *);
   virtual void DidMove(WebWidget* webwidget, const WebPluginGeometry& move);
   virtual void RunModal(WebWidget* webwidget);
   virtual void AddRef() {
-    RefCounted<TestWebViewDelegate>::AddRef();
+    base::RefCounted<TestWebViewDelegate>::AddRef();
   }
   virtual void Release() {
-    RefCounted<TestWebViewDelegate>::Release();
+    base::RefCounted<TestWebViewDelegate>::Release();
   }
 
   // Additional accessors
   WebFrame* top_loading_frame() { return top_loading_frame_; }
+#if defined(OS_WIN)
   IDropTarget* drop_delegate() { return drop_delegate_.get(); }
   IDropSource* drag_delegate() { return drag_delegate_.get(); }
+#endif
   const CapturedContextMenuEvents& captured_context_menu_events() const { 
     return captured_context_menu_events_; 
   }
   void clear_captured_context_menu_events() { 
     captured_context_menu_events_.clear(); 
   }
 
   // Methods for modifying WebPreferences
   void SetUserStyleSheetEnabled(bool is_enabled);
   void SetUserStyleSheetLocation(const GURL& location);
@@ skipping 38 matching lines @@
 
   // For tracking session history.  See RenderView.
   int page_id_;
   int last_page_id_updated_;
 
   // Maps resource identifiers to a descriptive string.
   typedef std::map<uint32, std::string> ResourceMap;
   ResourceMap resource_identifier_map_;
   std::string GetResourceDescription(uint32 identifier);
 
+#if defined(OS_WIN)
   HCURSOR custom_cursor_;
 
   // Classes needed by drag and drop.
   scoped_refptr<TestDragDelegate> drag_delegate_;
   scoped_refptr<TestDropDelegate> drop_delegate_;
+#endif
   
   CapturedContextMenuEvents captured_context_menu_events_;
 
   DISALLOW_EVIL_CONSTRUCTORS(TestWebViewDelegate);
 };
 
-#endif // WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H__
-
+#endif // WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_