(Mac) Allow the tracking of the "active" plugin delegate separate from the fake windows.

BUG=http://crbug.com/20717
TEST=none; no visible change

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

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

1 files changed, 3 insertions, 4 deletions

diff --git a/chrome/browser/plugin_carbon_interpose_mac.cc b/chrome/browser/plugin_carbon_interpose_mac.cc
index 45f0ffe..adbba7e 100644
--- a/chrome/browser/plugin_carbon_interpose_mac.cc
+++ b/chrome/browser/plugin_carbon_interpose_mac.cc
@@ -126,8 +126,9 @@ static void ChromePluginDisposeDialog(DialogRef dialog) {
 }
 
 static WindowPartCode ChromePluginFindWindow(Point point, WindowRef* window) {
+  WebPluginDelegateImpl* delegate = mac_plugin_interposing::GetActiveDelegate();
   FakePluginWindowTracker* tracker = FakePluginWindowTracker::SharedInstance();
-  WindowRef plugin_window = tracker->get_active_plugin_window();
+  WindowRef plugin_window = tracker->GetFakeWindowForDelegate(delegate);
   if (plugin_window) {
     // If plugin_window is non-NULL, then we are in the middle of routing an
     // event to the plugin, so we know it's destined for this window already,
@@ -145,9 +146,7 @@ static WindowPartCode ChromePluginFindWindow(Point point, WindowRef* window) {
 }
 
 static OSStatus ChromePluginSetThemeCursor(ThemeCursor cursor) {
-  FakePluginWindowTracker* tracker = FakePluginWindowTracker::SharedInstance();
-  WebPluginDelegateImpl* delegate =
-      tracker->GetDelegateForFakeWindow(tracker->get_active_plugin_window());
+  WebPluginDelegateImpl* delegate = mac_plugin_interposing::GetActiveDelegate();
   if (delegate) {
     mac_plugin_interposing::NotifyPluginOfSetThemeCursor(delegate, cursor);
     return noErr;