Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

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: 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
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 0bfdbba222e6e2656b64399908e2285b14661aef..c14a8684c46f76ed3b605f002493e1a134fa176e 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,6 +5,7 @@
#import "chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.h"
#include "apps/app_shim/extension_app_shim_handler_mac.h"
+#include "apps/app_window_registry_util.h"
#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
@@ -12,7 +13,6 @@
#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(
+ apps::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(
+ apps::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(
+ apps::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(
+ apps::AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile(
[NSApp keyWindow]);
if (appWindow)
apps::ExtensionAppShimHandler::FocusAppForWindow(appWindow);

Powered by Google App Engine
This is Rietveld 408576698