chrome/browser/app_controller_mac.mm - Issue 494033002: Move AppWindow to extensions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/app_controller_mac.mm

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove unneeded include in chrome_shell_delegate.cc Created 6 years, 4 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:

Index: chrome/browser/app_controller_mac.mm

diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm

index ac2a19e7786305987ade1561484e872e68df6f8c..4bbc7c94fceecc4d199f1560f6f609fb1adb678e 100644

--- a/chrome/browser/app_controller_mac.mm

+++ b/chrome/browser/app_controller_mac.mm

@@ -5,7 +5,6 @@

#import "chrome/browser/app_controller_mac.h"

#include "apps/app_shim/extension_app_shim_handler_mac.h"

-#include "apps/app_window_registry.h"

#include "base/auto_reset.h"

#include "base/bind.h"

#include "base/command_line.h"

@@ -87,6 +86,7 @@

#include "content/public/browser/notification_types.h"

#include "content/public/browser/plugin_service.h"

#include "content/public/browser/user_metrics.h"

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

#include "extensions/browser/extension_system.h"

#include "net/base/filename_util.h"

#include "ui/base/cocoa/focus_window_set.h"

@@ -433,7 +433,7 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {

- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication*)app {

// If there are no windows, quit immediately.

if (chrome::BrowserIterator().done() &&

- !apps::AppWindowRegistry::IsAppWindowRegisteredInAnyProfile(0)) {

+ !extensions::AppWindowRegistry::IsAppWindowRegisteredInAnyProfile(0)) {

return NSTerminateNow;

}