OLD | NEW |
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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
7 #include "base/files/scoped_temp_dir.h" | 7 #include "base/files/scoped_temp_dir.h" |
8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
10 #include "base/test/test_timeouts.h" | 10 #include "base/test/test_timeouts.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "chrome/browser/extensions/extension_test_message_listener.h" | 24 #include "chrome/browser/extensions/extension_test_message_listener.h" |
25 #include "chrome/browser/extensions/platform_app_browsertest_util.h" | 25 #include "chrome/browser/extensions/platform_app_browsertest_util.h" |
26 #include "chrome/browser/extensions/platform_app_launcher.h" | 26 #include "chrome/browser/extensions/platform_app_launcher.h" |
27 #include "chrome/browser/extensions/shell_window_registry.h" | 27 #include "chrome/browser/extensions/shell_window_registry.h" |
28 #include "chrome/browser/tab_contents/render_view_context_menu.h" | 28 #include "chrome/browser/tab_contents/render_view_context_menu.h" |
29 #include "chrome/browser/ui/browser.h" | 29 #include "chrome/browser/ui/browser.h" |
30 #include "chrome/browser/ui/extensions/application_launch.h" | 30 #include "chrome/browser/ui/extensions/application_launch.h" |
31 #include "chrome/browser/ui/extensions/native_app_window.h" | 31 #include "chrome/browser/ui/extensions/native_app_window.h" |
32 #include "chrome/browser/ui/extensions/shell_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/browser/ui/web_contents_modal_dialog_manager.h" | |
35 #include "chrome/common/chrome_notification_types.h" | 34 #include "chrome/common/chrome_notification_types.h" |
36 #include "chrome/common/chrome_switches.h" | 35 #include "chrome/common/chrome_switches.h" |
37 #include "chrome/common/url_constants.h" | 36 #include "chrome/common/url_constants.h" |
38 #include "chrome/test/base/ui_test_utils.h" | 37 #include "chrome/test/base/ui_test_utils.h" |
39 #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" |
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 "googleurl/src/gurl.h" | 45 #include "googleurl/src/gurl.h" |
46 | 46 |
47 using content::WebContents; | 47 using content::WebContents; |
| 48 using web_modal::WebContentsModalDialogManager; |
48 | 49 |
49 namespace extensions { | 50 namespace extensions { |
50 | 51 |
51 namespace { | 52 namespace { |
52 | 53 |
53 // Non-abstract RenderViewContextMenu class. | 54 // Non-abstract RenderViewContextMenu class. |
54 class PlatformAppContextMenu : public RenderViewContextMenu { | 55 class PlatformAppContextMenu : public RenderViewContextMenu { |
55 public: | 56 public: |
56 PlatformAppContextMenu(WebContents* web_contents, | 57 PlatformAppContextMenu(WebContents* web_contents, |
57 const content::ContextMenuParams& params) | 58 const content::ContextMenuParams& params) |
(...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
986 | 987 |
987 while (!ContainsKey(opener_app_ids_, file_manager->id())) { | 988 while (!ContainsKey(opener_app_ids_, file_manager->id())) { |
988 content::RunAllPendingInMessageLoop(); | 989 content::RunAllPendingInMessageLoop(); |
989 } | 990 } |
990 } | 991 } |
991 | 992 |
992 #endif // defined(OS_CHROMEOS) | 993 #endif // defined(OS_CHROMEOS) |
993 | 994 |
994 | 995 |
995 } // namespace extensions | 996 } // namespace extensions |
OLD | NEW |