Move the Carbon SetCursor method on WebPluginDelegateImpl to a different name to avoid conflict with the cross-platform SetCursor call on WebPluginDelegate.

BUG=72151
TEST=clang compiles Chromium again. No user-visible change.

Review URL: http://codereview.chromium.org/6368128

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73991 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 4 deletions

diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.h b/webkit/plugins/npapi/webplugin_delegate_impl.h
index 4fc5531..1dfc639 100644
--- a/webkit/plugins/npapi/webplugin_delegate_impl.h
+++ b/webkit/plugins/npapi/webplugin_delegate_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -165,10 +165,12 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
   // Informs the plugin that IME composition has completed.
   // If |text| is empty, IME was cancelled.
   void ImeCompositionCompleted(const string16& text);
+#ifndef NP_NO_CARBON
   // Informs the delegate that the plugin set a Carbon ThemeCursor.
   void SetThemeCursor(ThemeCursor cursor);
   // Informs the delegate that the plugin set a Carbon Cursor.
-  void SetCursor(const Cursor* cursor);
+  void SetCarbonCursor(const Cursor* cursor);
+#endif
   // Informs the delegate that the plugin set a Cocoa NSCursor.
   void SetNSCursor(NSCursor* cursor);
 
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm
index e43453d..41f41e7 100644
--- a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm
+++ b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -934,13 +934,15 @@ void WebPluginDelegateImpl::ImeCompositionCompleted(const string16& text) {
   }
 }
 
+#ifndef NP_NO_CARBON
 void WebPluginDelegateImpl::SetThemeCursor(ThemeCursor cursor) {
   current_windowless_cursor_.InitFromThemeCursor(cursor);
 }
 
-void WebPluginDelegateImpl::SetCursor(const Cursor* cursor) {
+void WebPluginDelegateImpl::SetCarbonCursor(const Cursor* cursor) {
   current_windowless_cursor_.InitFromCursor(cursor);
 }
+#endif
 
 void WebPluginDelegateImpl::SetNSCursor(NSCursor* cursor) {
   current_windowless_cursor_.InitFromNSCursor(cursor);