athena/main/athena_app_window_controller.cc - Issue 412713002: Move apps/shell to extensions/shell.

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: athena/main/athena_app_window_controller.cc

Issue 412713002: Move apps/shell to extensions/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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: athena/main/athena_app_window_controller.cc

diff --git a/athena/main/athena_app_window_controller.cc b/athena/main/athena_app_window_controller.cc

index df44bc5b58d2e2a3dff7108478d019a771e1bf58..6ab7c91eea30e31cc7cce8c27e41c8a523052c06 100644

--- a/athena/main/athena_app_window_controller.cc

+++ b/athena/main/athena_app_window_controller.cc

@@ -4,11 +4,11 @@

#include "athena/main/athena_app_window_controller.h"

-#include "apps/shell/browser/shell_app_window.h"

#include "athena/activity/public/activity_factory.h"

#include "athena/activity/public/activity_manager.h"

#include "base/memory/scoped_ptr.h"

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

+#include "extensions/shell/browser/shell_app_window.h"

namespace athena {