diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-07 16:19:51 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-07 16:19:51 +0000 |
| commit | 6ce58c8a9571be906dd33d5ac398a99d67c04d2d (patch) | |
| tree | c522a4e7a847d3b2582520a486044d73bb3d9c4f /chrome/plugin | |
| parent | 39eeb836bb9a0b0581fa05c3f3afc43c11d142eb (diff) | |
| download | chromium_src-6ce58c8a9571be906dd33d5ac398a99d67c04d2d.zip chromium_src-6ce58c8a9571be906dd33d5ac398a99d67c04d2d.tar.gz chromium_src-6ce58c8a9571be906dd33d5ac398a99d67c04d2d.tar.bz2 | |
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
Diffstat (limited to 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/plugin_interpose_util_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/plugin/plugin_interpose_util_mac.mm b/chrome/plugin/plugin_interpose_util_mac.mm index 7299d4b..e0dec61 100644 --- a/chrome/plugin/plugin_interpose_util_mac.mm +++ b/chrome/plugin/plugin_interpose_util_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. @@ -79,7 +79,7 @@ void NotifyPluginOfSetThemeCursor(OpaquePluginRef delegate, __attribute__((visibility("default"))) void NotifyPluginOfSetCursor(OpaquePluginRef delegate, const Cursor* cursor) { - static_cast<webkit::npapi::WebPluginDelegateImpl*>(delegate)->SetCursor( + static_cast<webkit::npapi::WebPluginDelegateImpl*>(delegate)->SetCarbonCursor( cursor); } |