summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-17 19:27:08 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-17 19:27:08 +0000
commitec41a1d0f8d75e3b21ea4db6dbbb432e08a8e923 (patch)
treebb6fffe9057f08464d3005fffd43cf83ea8a91d2 /webkit
parente67d0817abcec13b5d4eab730252ef1dfb9ab404 (diff)
downloadchromium_src-ec41a1d0f8d75e3b21ea4db6dbbb432e08a8e923.zip
chromium_src-ec41a1d0f8d75e3b21ea4db6dbbb432e08a8e923.tar.gz
chromium_src-ec41a1d0f8d75e3b21ea4db6dbbb432e08a8e923.tar.bz2
mac: Fix all build errors when building with clang with the 10.6 sdk.
It's just one: webkit/tools/test_shell/test_shell_mac.mm:311:26: error: incompatible pointer types sending 'WindowDelegate *' to parameter of type 'id<NSWindowDelegate>' [-Werror,-Wincompatible-pointer-types] [m_mainWnd setDelegate:[[WindowDelegate alloc] initWithWebView:web_view]]; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ webkit/tools/test_shell/test_shell_mac.mm:102:1: note: instance method 'initWithWebView:' is assumed to return an instance of its receiver type ('WindowDelegate *') - (id)initWithWebView:(TestShellWebView*)view; ^ 1 error generated. BUG=none TEST=none Review URL: http://codereview.chromium.org/7621034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell_mac.mm3
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 24cc83e..c21483e 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -15,6 +15,7 @@
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/logging.h"
+#include "base/mac/cocoa_protocols.h"
#include "base/mac/mac_util.h"
#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/message_loop.h"
@@ -94,7 +95,7 @@ FilePath GetResourcesFilePath() {
// Receives notification that the window is closing so that it can start the
// tear-down process. Is responsible for deleting itself when done.
-@interface WindowDelegate : NSObject {
+@interface WindowDelegate : NSObject<NSWindowDelegate> {
@private
TestShellWebView* m_webView;
}