chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm - Issue 586613002: Remove AppsClient::GetLoadedBrowserContexts

Unified Diff: chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm

Issue 586613002: Remove AppsClient::GetLoadedBrowserContexts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move to chrome/browser/apps Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/apps/app_window_registry_util.h ('K') | « chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc ('k') | chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 efeb4789e6cf9d5ad25306e4c5c30e9c8c910dbd..971172cf5d9d66d1fedf091dd680a3a310091839 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

@@ -9,10 +9,10 @@

#include "base/strings/utf_string_conversions.h"

#include "chrome/app/chrome_command_ids.h"

#include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"

+#include "chrome/browser/apps/app_window_registry_util.h"

#import "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h"

#include "chrome/grit/generated_resources.h"

#include "extensions/browser/app_window/app_window.h"

-#include "extensions/browser/app_window/app_window_registry.h"

#include "extensions/common/extension.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/l10n/l10n_util_mac.h"

@@ -289,7 +289,7 @@ void AddDuplicateItem(NSMenuItem* top_level_item,

NSString* name = [notification name];

if ([name isEqualToString:NSWindowDidBecomeMainNotification]) {

extensions::AppWindow* appWindow =

- extensions::AppWindowRegistry::GetAppWindowForNativeWindowAnyProfile(

+ AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile(

window);

const extensions::Extension* extension = NULL;

@@ -370,7 +370,7 @@ void AddDuplicateItem(NSMenuItem* top_level_item,

- (void)quitCurrentPlatformApp {

extensions::AppWindow* appWindow =

- extensions::AppWindowRegistry::GetAppWindowForNativeWindowAnyProfile(

+ AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile(

[NSApp keyWindow]);

if (appWindow)

apps::ExtensionAppShimHandler::QuitAppForWindow(appWindow);

@@ -378,7 +378,7 @@ void AddDuplicateItem(NSMenuItem* top_level_item,

- (void)hideCurrentPlatformApp {

extensions::AppWindow* appWindow =

- extensions::AppWindowRegistry::GetAppWindowForNativeWindowAnyProfile(

+ AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile(

[NSApp keyWindow]);

if (appWindow)

apps::ExtensionAppShimHandler::HideAppForWindow(appWindow);

@@ -386,7 +386,7 @@ void AddDuplicateItem(NSMenuItem* top_level_item,

- (void)focusCurrentPlatformApp {

extensions::AppWindow* appWindow =

- extensions::AppWindowRegistry::GetAppWindowForNativeWindowAnyProfile(

+ AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile(

[NSApp keyWindow]);

if (appWindow)

apps::ExtensionAppShimHandler::FocusAppForWindow(appWindow);