diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 03:52:48 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 03:52:48 +0000 |
| commit | 24b2cd1bd69407b47b668dbbf926f55ac1ac375f (patch) | |
| tree | fe9a0cad00c343cae0bec559f09c367e57f16038 | |
| parent | 7b60ddadf4d55987b9cbffdad16c776b276f44cc (diff) | |
| download | chromium_src-24b2cd1bd69407b47b668dbbf926f55ac1ac375f.zip chromium_src-24b2cd1bd69407b47b668dbbf926f55ac1ac375f.tar.gz chromium_src-24b2cd1bd69407b47b668dbbf926f55ac1ac375f.tar.bz2 | |
Merge 32269 - Interpose one more Carbon function for Window disposing
BUG=27820
TEST=Focus should return to browser window in test case from bug.
Review URL: http://codereview.chromium.org/402037
TBR=stuartmorgan@chromium.org
Review URL: http://codereview.chromium.org/402042
git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@32275 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/plugin_carbon_interpose_mac.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/plugin_carbon_interpose_mac.cc b/chrome/browser/plugin_carbon_interpose_mac.cc index 1957f47..e0e17b0 100644 --- a/chrome/browser/plugin_carbon_interpose_mac.cc +++ b/chrome/browser/plugin_carbon_interpose_mac.cc @@ -138,6 +138,15 @@ static void ChromePluginHideWindow(WindowRef window) { MaybeReactivateSavedProcess(); } +static void ChromePluginDisposeDialog(DialogRef dialog) { + WindowRef window = GetDialogWindow(dialog); + CGWindowID window_id = HIWindowGetCGWindowID(window); + CGRect window_rect = CGRectForWindow(window); + DisposeDialog(dialog); + webkit_glue::NotifyBrowserOfPluginDisposeWindow(window_id, window_rect); + MaybeReactivateSavedProcess(); +} + #pragma mark - struct interpose_substitution { @@ -156,4 +165,5 @@ __attribute__((used)) static const interpose_substitution substitutions[] INTERPOSE_FUNCTION(ShowWindow), INTERPOSE_FUNCTION(DisposeWindow), INTERPOSE_FUNCTION(HideWindow), + INTERPOSE_FUNCTION(DisposeDialog), }; |