Index: chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm |
diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm |
index b64b87d66f403bc1ab16a53fc1cd60560c144345..a65e792295e2f20d3b69a1d5b1801b55d26e5ec7 100644 |
--- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm |
+++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm |
@@ -5,8 +5,8 @@ |
#import "chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.h" |
#include "apps/app_shim/extension_app_shim_handler_mac.h" |
-#include "apps/shell_window.h" |
-#include "apps/shell_window_registry.h" |
+#include "apps/app_window.h" |
+#include "apps/app_window_registry.h" |
#include "base/strings/sys_string_conversions.h" |
#include "base/strings/utf_string_conversions.h" |
#include "chrome/app/chrome_command_ids.h" |
@@ -280,11 +280,10 @@ void AddDuplicateItem(NSMenuItem* top_level_item, |
id window = [notification object]; |
NSString* name = [notification name]; |
if ([name isEqualToString:NSWindowDidBecomeMainNotification]) { |
- apps::ShellWindow* shellWindow = |
- apps::ShellWindowRegistry::GetShellWindowForNativeWindowAnyProfile( |
- window); |
- if (shellWindow) |
- [self addMenuItems:shellWindow->extension()]; |
+ apps::AppWindow* appWindow = |
+ apps::AppWindowRegistry::GetAppWindowForNativeWindowAnyProfile(window); |
+ if (appWindow) |
+ [self addMenuItems:appWindow->extension()]; |
else |
[self removeMenuItems]; |
} else if ([name isEqualToString:NSWindowWillCloseNotification]) { |
@@ -356,27 +355,27 @@ void AddDuplicateItem(NSMenuItem* top_level_item, |
} |
- (void)quitCurrentPlatformApp { |
- apps::ShellWindow* shellWindow = |
- apps::ShellWindowRegistry::GetShellWindowForNativeWindowAnyProfile( |
+ apps::AppWindow* appWindow = |
+ apps::AppWindowRegistry::GetAppWindowForNativeWindowAnyProfile( |
[NSApp keyWindow]); |
- if (shellWindow) |
- apps::ExtensionAppShimHandler::QuitAppForWindow(shellWindow); |
+ if (appWindow) |
+ apps::ExtensionAppShimHandler::QuitAppForWindow(appWindow); |
} |
- (void)hideCurrentPlatformApp { |
- apps::ShellWindow* shellWindow = |
- apps::ShellWindowRegistry::GetShellWindowForNativeWindowAnyProfile( |
+ apps::AppWindow* appWindow = |
+ apps::AppWindowRegistry::GetAppWindowForNativeWindowAnyProfile( |
[NSApp keyWindow]); |
- if (shellWindow) |
- apps::ExtensionAppShimHandler::HideAppForWindow(shellWindow); |
+ if (appWindow) |
+ apps::ExtensionAppShimHandler::HideAppForWindow(appWindow); |
} |
- (void)focusCurrentPlatformApp { |
- apps::ShellWindow* shellWindow = |
- apps::ShellWindowRegistry::GetShellWindowForNativeWindowAnyProfile( |
+ apps::AppWindow* appWindow = |
+ apps::AppWindowRegistry::GetAppWindowForNativeWindowAnyProfile( |
[NSApp keyWindow]); |
- if (shellWindow) |
- apps::ExtensionAppShimHandler::FocusAppForWindow(shellWindow); |
+ if (appWindow) |
+ apps::ExtensionAppShimHandler::FocusAppForWindow(appWindow); |
} |
@end |