Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / apps / app_shim_menu_controller_mac.mm

diff --git a/src/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm b/src/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm
index a65e792..3147386 100644 (file)
--- a/src/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm
+++ b/src/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm
@@ -282,8 +282,13 @@ void AddDuplicateItem(NSMenuItem* top_level_item,
   if ([name isEqualToString:NSWindowDidBecomeMainNotification]) {
     apps::AppWindow* appWindow =
         apps::AppWindowRegistry::GetAppWindowForNativeWindowAnyProfile(window);
+
+    const extensions::Extension* extension = NULL;
     if (appWindow)
-      [self addMenuItems:appWindow->extension()];
+      extension = appWindow->GetExtension();
+
+    if (extension)
+      [self addMenuItems:extension];
     else
       [self removeMenuItems];
   } else if ([name isEqualToString:NSWindowWillCloseNotification]) {