chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc - Issue 479933003: Move NativeAppWindow 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/ui/ash/launcher/chrome_launcher_controller_unittest.cc

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

Patch Set: 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:

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

Download patch

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

index b9ae930a26c6c306e24d893f0217d8cc3adbbe9d..7f94b7b8f7d31d4c11213f55542754c869c78713 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

@@ -49,7 +49,6 @@

#if defined(OS_CHROMEOS)

#include "apps/app_window_contents.h"

#include "apps/app_window_registry.h"

-#include "apps/ui/native_app_window.h"

#include "ash/test/test_session_state_delegate.h"

#include "ash/test/test_shell_delegate.h"

#include "chrome/browser/chromeos/login/users/fake_user_manager.h"

@@ -66,6 +65,7 @@

#include "chrome/test/base/testing_profile_manager.h"

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

#include "content/public/test/test_utils.h"

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

#include "ui/aura/window.h"

#endif