chrome/browser/extensions/startup_helper.cc - 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/extensions/startup_helper.cc

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/extensions/startup_helper.cc

diff --git a/chrome/browser/extensions/startup_helper.cc b/chrome/browser/extensions/startup_helper.cc

index f9f1228c672ea38d09b1f806e337958ade469901..25cd85e66a1125a226baa7709f24f162b2d9a057 100644

--- a/chrome/browser/extensions/startup_helper.cc

+++ b/chrome/browser/extensions/startup_helper.cc

@@ -26,8 +26,8 @@

#include "ipc/ipc_message.h"

#if defined(OS_WIN)

-#include "apps/app_window.h"

-#include "apps/app_window_registry.h"

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

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

#include "extensions/browser/extension_registry.h"

#include "extensions/browser/extension_util.h"

#endif

@@ -58,10 +58,10 @@ CreateEphemeralAppInstaller(

return installer;

}

- apps::AppWindowRegistry* app_window_registry =

- apps::AppWindowRegistry::Get(profile);

+ extensions::AppWindowRegistry* app_window_registry =

+ extensions::AppWindowRegistry::Get(profile);

DCHECK(app_window_registry);

- apps::AppWindow* app_window =

+ extensions::AppWindow* app_window =

app_window_registry->GetCurrentAppWindowForApp(app_id);

if (!app_window)

return installer;