chrome/browser/apps/app_browsertest.cc - Issue 23847004: "Redirecting URLs to Packaged Apps" implementation: revised

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/apps/app_browsertest.cc

Issue 23847004: "Redirecting URLs to Packaged Apps" implementation: revised (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log

« apps/launcher.h ('K') | « apps/launcher.cc ('k') | chrome/browser/apps/app_browsertest_util.h » ('j') | chrome/browser/apps/app_browsertest_util.h » ('J')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "apps/launcher.h"	5 #include "apps/launcher.h"

6 #include "apps/native_app_window.h"	6 #include "apps/native_app_window.h"

7 #include "apps/shell_window.h"	7 #include "apps/shell_window.h"

8 #include "apps/shell_window_registry.h"	8 #include "apps/shell_window_registry.h"

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/file_util.h"	11 #include "base/file_util.h"

12 #include "base/files/scoped_temp_dir.h"	12 #include "base/files/scoped_temp_dir.h"

13 #include "base/prefs/pref_service.h"	13 #include "base/prefs/pref_service.h"

14 #include "base/stl_util.h"	14 #include "base/stl_util.h"

15 #include "base/strings/utf_string_conversions.h"	15 #include "base/strings/utf_string_conversions.h"

16 #include "base/test/test_timeouts.h"

17 #include "base/threading/platform_thread.h"

18 #include "chrome/app/chrome_command_ids.h"	16 #include "chrome/app/chrome_command_ids.h"

19 #include "chrome/browser/apps/app_browsertest_util.h"	17 #include "chrome/browser/apps/app_browsertest_util.h"

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

21 #include "chrome/browser/chrome_notification_types.h"	19 #include "chrome/browser/chrome_notification_types.h"

22 #include "chrome/browser/devtools/devtools_window.h"	20 #include "chrome/browser/devtools/devtools_window.h"

23 #include "chrome/browser/extensions/api/permissions/permissions_api.h"	21 #include "chrome/browser/extensions/api/permissions/permissions_api.h"

24 #include "chrome/browser/extensions/component_loader.h"	22 #include "chrome/browser/extensions/component_loader.h"

25 #include "chrome/browser/extensions/event_router.h"	23 #include "chrome/browser/extensions/event_router.h"

26 #include "chrome/browser/extensions/extension_browsertest.h"	24 #include "chrome/browser/extensions/extension_browsertest.h"

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

(...skipping 1083 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1111	1109

1112 while (!ContainsKey(opener_app_ids_, file_manager->id())) {	1110 while (!ContainsKey(opener_app_ids_, file_manager->id())) {

1113 content::RunAllPendingInMessageLoop();	1111 content::RunAllPendingInMessageLoop();

1114 }	1112 }

1115 }	1113 }

1116	1114

1117 #endif // defined(OS_CHROMEOS)	1115 #endif // defined(OS_CHROMEOS)

1118	1116

1119	1117

1120 } // namespace extensions	1118 } // namespace extensions

OLD	NEW