Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side Diff: chrome/browser/extensions/platform_app_browsertest.cc

Issue 16702003: Move ShellWindow into apps component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: yar Created 7 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/shell_window.h"
5 #include "base/bind.h" 6 #include "base/bind.h"
6 #include "base/file_util.h" 7 #include "base/file_util.h"
7 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
8 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
9 #include "base/stl_util.h" 10 #include "base/stl_util.h"
10 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
11 #include "base/test/test_timeouts.h" 12 #include "base/test/test_timeouts.h"
12 #include "base/threading/platform_thread.h" 13 #include "base/threading/platform_thread.h"
13 #include "chrome/app/chrome_command_ids.h" 14 #include "chrome/app/chrome_command_ids.h"
14 #include "chrome/browser/automation/automation_util.h" 15 #include "chrome/browser/automation/automation_util.h"
15 #include "chrome/browser/devtools/devtools_window.h" 16 #include "chrome/browser/devtools/devtools_window.h"
16 #include "chrome/browser/extensions/api/permissions/permissions_api.h" 17 #include "chrome/browser/extensions/api/permissions/permissions_api.h"
17 #include "chrome/browser/extensions/component_loader.h" 18 #include "chrome/browser/extensions/component_loader.h"
18 #include "chrome/browser/extensions/event_names.h" 19 #include "chrome/browser/extensions/event_names.h"
19 #include "chrome/browser/extensions/event_router.h" 20 #include "chrome/browser/extensions/event_router.h"
20 #include "chrome/browser/extensions/extension_browsertest.h" 21 #include "chrome/browser/extensions/extension_browsertest.h"
21 #include "chrome/browser/extensions/extension_prefs.h" 22 #include "chrome/browser/extensions/extension_prefs.h"
22 #include "chrome/browser/extensions/extension_service.h" 23 #include "chrome/browser/extensions/extension_service.h"
23 #include "chrome/browser/extensions/extension_system.h" 24 #include "chrome/browser/extensions/extension_system.h"
24 #include "chrome/browser/extensions/extension_test_message_listener.h" 25 #include "chrome/browser/extensions/extension_test_message_listener.h"
25 #include "chrome/browser/extensions/platform_app_browsertest_util.h" 26 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
26 #include "chrome/browser/extensions/platform_app_launcher.h" 27 #include "chrome/browser/extensions/platform_app_launcher.h"
27 #include "chrome/browser/extensions/shell_window_registry.h" 28 #include "chrome/browser/extensions/shell_window_registry.h"
28 #include "chrome/browser/tab_contents/render_view_context_menu.h" 29 #include "chrome/browser/tab_contents/render_view_context_menu.h"
29 #include "chrome/browser/ui/browser.h" 30 #include "chrome/browser/ui/browser.h"
30 #include "chrome/browser/ui/extensions/application_launch.h" 31 #include "chrome/browser/ui/extensions/application_launch.h"
31 #include "chrome/browser/ui/extensions/native_app_window.h" 32 #include "chrome/browser/ui/extensions/native_app_window.h"
32 #include "chrome/browser/ui/extensions/shell_window.h"
33 #include "chrome/browser/ui/tabs/tab_strip_model.h" 33 #include "chrome/browser/ui/tabs/tab_strip_model.h"
34 #include "chrome/common/chrome_notification_types.h" 34 #include "chrome/common/chrome_notification_types.h"
35 #include "chrome/common/chrome_switches.h" 35 #include "chrome/common/chrome_switches.h"
36 #include "chrome/common/url_constants.h" 36 #include "chrome/common/url_constants.h"
37 #include "chrome/test/base/ui_test_utils.h" 37 #include "chrome/test/base/ui_test_utils.h"
38 #include "components/user_prefs/pref_registry_syncable.h" 38 #include "components/user_prefs/pref_registry_syncable.h"
39 #include "components/web_modal/web_contents_modal_dialog_manager.h" 39 #include "components/web_modal/web_contents_modal_dialog_manager.h"
40 #include "content/public/browser/devtools_agent_host.h" 40 #include "content/public/browser/devtools_agent_host.h"
41 #include "content/public/browser/render_process_host.h" 41 #include "content/public/browser/render_process_host.h"
42 #include "content/public/browser/render_widget_host_view.h" 42 #include "content/public/browser/render_widget_host_view.h"
43 #include "content/public/browser/web_contents_view.h" 43 #include "content/public/browser/web_contents_view.h"
44 #include "content/public/test/test_utils.h" 44 #include "content/public/test/test_utils.h"
45 #include "net/test/embedded_test_server/embedded_test_server.h" 45 #include "net/test/embedded_test_server/embedded_test_server.h"
46 #include "googleurl/src/gurl.h" 46 #include "googleurl/src/gurl.h"
47 47
48 using apps::ShellWindow;
48 using content::WebContents; 49 using content::WebContents;
49 using web_modal::WebContentsModalDialogManager; 50 using web_modal::WebContentsModalDialogManager;
50 51
51 namespace extensions { 52 namespace extensions {
52 53
53 namespace { 54 namespace {
54 55
55 // Non-abstract RenderViewContextMenu class. 56 // Non-abstract RenderViewContextMenu class.
56 class PlatformAppContextMenu : public RenderViewContextMenu { 57 class PlatformAppContextMenu : public RenderViewContextMenu {
57 public: 58 public:
(...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after
1077 1078
1078 while (!ContainsKey(opener_app_ids_, file_manager->id())) { 1079 while (!ContainsKey(opener_app_ids_, file_manager->id())) {
1079 content::RunAllPendingInMessageLoop(); 1080 content::RunAllPendingInMessageLoop();
1080 } 1081 }
1081 } 1082 }
1082 1083
1083 #endif // defined(OS_CHROMEOS) 1084 #endif // defined(OS_CHROMEOS)
1084 1085
1085 1086
1086 } // namespace extensions 1087 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_tab_util.cc ('k') | chrome/browser/extensions/platform_app_browsertest_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698