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/app_window.h" | |
6 #include "apps/app_window_registry.h" | |
7 #include "apps/launcher.h" | 5 #include "apps/launcher.h" |
8 #include "base/bind.h" | 6 #include "base/bind.h" |
9 #include "base/command_line.h" | 7 #include "base/command_line.h" |
10 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
11 #include "base/files/scoped_temp_dir.h" | 9 #include "base/files/scoped_temp_dir.h" |
12 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
13 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
14 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
15 #include "chrome/app/chrome_command_ids.h" | 13 #include "chrome/app/chrome_command_ids.h" |
16 #include "chrome/browser/apps/app_browsertest_util.h" | 14 #include "chrome/browser/apps/app_browsertest_util.h" |
(...skipping 13 matching lines...) Expand all Loading... |
30 #include "chrome/common/pref_names.h" | 28 #include "chrome/common/pref_names.h" |
31 #include "chrome/common/url_constants.h" | 29 #include "chrome/common/url_constants.h" |
32 #include "chrome/test/base/test_switches.h" | 30 #include "chrome/test/base/test_switches.h" |
33 #include "chrome/test/base/ui_test_utils.h" | 31 #include "chrome/test/base/ui_test_utils.h" |
34 #include "components/pref_registry/pref_registry_syncable.h" | 32 #include "components/pref_registry/pref_registry_syncable.h" |
35 #include "components/web_modal/web_contents_modal_dialog_manager.h" | 33 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
36 #include "content/public/browser/devtools_agent_host.h" | 34 #include "content/public/browser/devtools_agent_host.h" |
37 #include "content/public/browser/render_process_host.h" | 35 #include "content/public/browser/render_process_host.h" |
38 #include "content/public/browser/render_widget_host_view.h" | 36 #include "content/public/browser/render_widget_host_view.h" |
39 #include "content/public/test/test_utils.h" | 37 #include "content/public/test/test_utils.h" |
| 38 #include "extensions/browser/app_window/app_window.h" |
| 39 #include "extensions/browser/app_window/app_window_registry.h" |
40 #include "extensions/browser/app_window/native_app_window.h" | 40 #include "extensions/browser/app_window/native_app_window.h" |
41 #include "extensions/browser/event_router.h" | 41 #include "extensions/browser/event_router.h" |
42 #include "extensions/browser/extension_prefs.h" | 42 #include "extensions/browser/extension_prefs.h" |
43 #include "extensions/browser/extension_system.h" | 43 #include "extensions/browser/extension_system.h" |
44 #include "extensions/browser/notification_types.h" | 44 #include "extensions/browser/notification_types.h" |
45 #include "extensions/browser/pref_names.h" | 45 #include "extensions/browser/pref_names.h" |
46 #include "extensions/common/api/app_runtime.h" | 46 #include "extensions/common/api/app_runtime.h" |
47 #include "net/test/embedded_test_server/embedded_test_server.h" | 47 #include "net/test/embedded_test_server/embedded_test_server.h" |
48 #include "url/gurl.h" | 48 #include "url/gurl.h" |
49 | 49 |
50 #if defined(OS_CHROMEOS) | 50 #if defined(OS_CHROMEOS) |
51 #include "base/memory/scoped_ptr.h" | 51 #include "base/memory/scoped_ptr.h" |
52 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" | 52 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" |
53 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" | 53 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" |
54 #include "chromeos/dbus/dbus_thread_manager.h" | 54 #include "chromeos/dbus/dbus_thread_manager.h" |
55 #include "chromeos/dbus/fake_power_manager_client.h" | 55 #include "chromeos/dbus/fake_power_manager_client.h" |
56 #endif | 56 #endif |
57 | 57 |
58 using apps::AppWindow; | |
59 using apps::AppWindowRegistry; | |
60 using content::WebContents; | 58 using content::WebContents; |
61 using web_modal::WebContentsModalDialogManager; | 59 using web_modal::WebContentsModalDialogManager; |
62 | 60 |
63 namespace app_runtime = extensions::core_api::app_runtime; | 61 namespace app_runtime = extensions::core_api::app_runtime; |
64 | 62 |
65 namespace extensions { | 63 namespace extensions { |
66 | 64 |
67 namespace { | 65 namespace { |
68 | 66 |
69 // Non-abstract RenderViewContextMenu class. | 67 // Non-abstract RenderViewContextMenu class. |
(...skipping 1246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1316 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched"); | 1314 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched"); |
1317 ASSERT_TRUE(extension); | 1315 ASSERT_TRUE(extension); |
1318 ASSERT_EQ(extension_id, extension->id()); | 1316 ASSERT_EQ(extension_id, extension->id()); |
1319 | 1317 |
1320 ExtensionApiTest::ResultCatcher result_catcher; | 1318 ExtensionApiTest::ResultCatcher result_catcher; |
1321 EXPECT_TRUE(result_catcher.GetNextResult()); | 1319 EXPECT_TRUE(result_catcher.GetNextResult()); |
1322 } | 1320 } |
1323 } | 1321 } |
1324 | 1322 |
1325 } // namespace extensions | 1323 } // namespace extensions |
OLD | NEW |