diff options
author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 11:05:49 +0000 |
---|---|---|
committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 11:05:49 +0000 |
commit | 48940890240cb211cfaed1c8cb427b27152f9608 (patch) | |
tree | 724ca066a19ec8269014f77f399776198248a241 /content/plugin | |
parent | 9cea9091619e6b935ad3e0edb16ca25c876388b1 (diff) | |
download | chromium_src-48940890240cb211cfaed1c8cb427b27152f9608.zip chromium_src-48940890240cb211cfaed1c8cb427b27152f9608.tar.gz chromium_src-48940890240cb211cfaed1c8cb427b27152f9608.tar.bz2 |
Remove a dead code path in Mac NPAPI context menu support
This complicated path was for 10.5 only, so is no longer used.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11191053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin')
-rw-r--r-- | content/plugin/plugin_interpose_util_mac.mm | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/content/plugin/plugin_interpose_util_mac.mm b/content/plugin/plugin_interpose_util_mac.mm index c8c12d9..670a2f2 100644 --- a/content/plugin/plugin_interpose_util_mac.mm +++ b/content/plugin/plugin_interpose_util_mac.mm @@ -137,10 +137,6 @@ static void OnPluginWindowShown(const WindowInfo& window_info, BOOL is_modal) { @interface NSWindow (ChromePluginUtilities) // Returns YES if the window is visible and actually on the screen. - (BOOL)chromePlugin_isWindowOnScreen; -// Returns YES if the window is the dummy window we use for popup menus; -// see PluginInstance::PopUpContextMenu. -// This can be removed once 10.5 is no longer supported. -- (BOOL)chromePlugin_isPopupMenuWindow; @end @implementation NSWindow (ChromePluginUtilities) @@ -156,10 +152,6 @@ static void OnPluginWindowShown(const WindowInfo& window_info, BOOL is_modal) { return NO; } -- (BOOL)chromePlugin_isPopupMenuWindow { - return [[self title] isEqualToString:@"PopupMenuDummy"]; -} - @end @interface NSWindow (ChromePluginInterposing) @@ -179,16 +171,14 @@ static void OnPluginWindowShown(const WindowInfo& window_info, BOOL is_modal) { - (void)chromePlugin_orderFront:(id)sender { [self chromePlugin_orderFront:sender]; - if ([self chromePlugin_isWindowOnScreen] && - ![self chromePlugin_isPopupMenuWindow]) + if ([self chromePlugin_isWindowOnScreen]) mac_plugin_interposing::SwitchToPluginProcess(); OnPluginWindowShown(WindowInfo(self), NO); } - (void)chromePlugin_makeKeyAndOrderFront:(id)sender { [self chromePlugin_makeKeyAndOrderFront:sender]; - if ([self chromePlugin_isWindowOnScreen] && - ![self chromePlugin_isPopupMenuWindow]) + if ([self chromePlugin_isWindowOnScreen]) mac_plugin_interposing::SwitchToPluginProcess(); OnPluginWindowShown(WindowInfo(self), NO); } @@ -198,8 +188,7 @@ static void OnPluginWindowShown(const WindowInfo& window_info, BOOL is_modal) { [self chromePlugin_setWindowNumber:num]; return; } - if (![self chromePlugin_isPopupMenuWindow]) - mac_plugin_interposing::SwitchToPluginProcess(); + mac_plugin_interposing::SwitchToPluginProcess(); [self chromePlugin_setWindowNumber:num]; OnPluginWindowShown(WindowInfo(self), NO); } |