From ae40ccd86384f6d6246f0d01b6629df16a008402 Mon Sep 17 00:00:00 2001 From: "stuartmorgan@chromium.org" Date: Tue, 2 Mar 2010 23:45:21 +0000 Subject: Rename FakePluginWindowTracker Removes confusion with the new "fake window" code related to the GPU process, and makes the name better reflect the reality of how the Carbon plugin windows are actually used since we no longer expect to replace them entirely with interposing. BUG=none TEST=none (no behavioral changes) Review URL: http://codereview.chromium.org/660407 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40459 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/plugin_carbon_interpose_mac.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'chrome/browser/plugin_carbon_interpose_mac.cc') diff --git a/chrome/browser/plugin_carbon_interpose_mac.cc b/chrome/browser/plugin_carbon_interpose_mac.cc index 020d9ae..850b363 100644 --- a/chrome/browser/plugin_carbon_interpose_mac.cc +++ b/chrome/browser/plugin_carbon_interpose_mac.cc @@ -6,7 +6,7 @@ #include "base/gfx/rect.h" #include "chrome/plugin/plugin_interpose_util_mac.h" -#include "webkit/glue/plugins/fake_plugin_window_tracker_mac.h" +#include "webkit/glue/plugins/carbon_plugin_window_tracker_mac.h" #pragma GCC diagnostic ignored "-Wdeprecated-declarations" @@ -59,7 +59,7 @@ static void OnPluginWindowSelected(WindowRef window) { static Boolean ChromePluginIsWindowActive(WindowRef window) { const WebPluginDelegateImpl* delegate = - FakePluginWindowTracker::SharedInstance()->GetDelegateForFakeWindow( + CarbonPluginWindowTracker::SharedInstance()->GetDelegateForDummyWindow( window); return delegate ? IsContainingWindowActive(delegate) : IsWindowActive(window); @@ -67,7 +67,7 @@ static Boolean ChromePluginIsWindowActive(WindowRef window) { static Boolean ChromePluginIsWindowHilited(WindowRef window) { const WebPluginDelegateImpl* delegate = - FakePluginWindowTracker::SharedInstance()->GetDelegateForFakeWindow( + CarbonPluginWindowTracker::SharedInstance()->GetDelegateForDummyWindow( window); return delegate ? IsContainingWindowActive(delegate) : IsWindowHilited(window); @@ -124,8 +124,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->GetFakeWindowForDelegate(delegate); + CarbonPluginWindowTracker* tracker = + CarbonPluginWindowTracker::SharedInstance(); + WindowRef plugin_window = tracker->GetDummyWindowForDelegate(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, -- cgit v1.1