chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc - Issue 23003004: Move apps tests from c/b/extensions to c/b/apps and refine DEPS.

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_per_app_browsertest.cc

Issue 23003004: Move apps tests from c/b/extensions to c/b/apps and refine DEPS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« chrome/browser/apps/app_browsertest_util.h ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc ('k') | chrome/chrome_tests.gypi » ('j') | chrome/chrome_tests.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 248b19a46179fcebf9a7aa012e4b470f64b3b9d7..4c35a216aad47d1f4fbd91e8a39ba43974394e81 100644

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

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

@@ -18,6 +18,7 @@

#include "ash/test/shell_test_api.h"

#include "ash/wm/window_util.h"

#include "base/strings/utf_string_conversions.h"

+#include "chrome/browser/apps/app_browsertest_util.h"

#include "chrome/browser/automation/automation_util.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/extensions/extension_apitest.h"

@@ -26,7 +27,6 @@

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_system.h"

#include "chrome/browser/extensions/extension_test_message_listener.h"

-#include "chrome/browser/extensions/platform_app_browsertest_util.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/app_list/app_list_service.h"

#include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"