| 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" | 5 #include "apps/app_window.h" |
| 6 #include "apps/app_window_registry.h" | 6 #include "apps/app_window_registry.h" |
| 7 #include "apps/common/api/app_runtime.h" | 7 #include "apps/common/api/app_runtime.h" |
| 8 #include "apps/launcher.h" | 8 #include "apps/launcher.h" |
| 9 #include "apps/ui/native_app_window.h" | 9 #include "apps/ui/native_app_window.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 #include "content/public/browser/render_widget_host_view.h" | 40 #include "content/public/browser/render_widget_host_view.h" |
| 41 #include "content/public/test/test_utils.h" | 41 #include "content/public/test/test_utils.h" |
| 42 #include "extensions/browser/event_router.h" | 42 #include "extensions/browser/event_router.h" |
| 43 #include "extensions/browser/extension_system.h" | 43 #include "extensions/browser/extension_system.h" |
| 44 #include "extensions/browser/pref_names.h" | 44 #include "extensions/browser/pref_names.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 "url/gurl.h" | 46 #include "url/gurl.h" |
| 47 | 47 |
| 48 #if defined(OS_CHROMEOS) | 48 #if defined(OS_CHROMEOS) |
| 49 #include "base/memory/scoped_ptr.h" | 49 #include "base/memory/scoped_ptr.h" |
| 50 #include "chrome/browser/chromeos/login/mock_user_manager.h" | 50 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" |
| 51 #include "chrome/browser/chromeos/login/user_manager.h" | 51 #include "chrome/browser/chromeos/login/users/user_manager.h" |
| 52 #include "chromeos/dbus/dbus_thread_manager.h" | 52 #include "chromeos/dbus/dbus_thread_manager.h" |
| 53 #include "chromeos/dbus/fake_dbus_thread_manager.h" | 53 #include "chromeos/dbus/fake_dbus_thread_manager.h" |
| 54 #include "chromeos/dbus/fake_power_manager_client.h" | 54 #include "chromeos/dbus/fake_power_manager_client.h" |
| 55 #endif | 55 #endif |
| 56 | 56 |
| 57 using apps::AppWindow; | 57 using apps::AppWindow; |
| 58 using apps::AppWindowRegistry; | 58 using apps::AppWindowRegistry; |
| 59 using content::WebContents; | 59 using content::WebContents; |
| 60 using web_modal::WebContentsModalDialogManager; | 60 using web_modal::WebContentsModalDialogManager; |
| 61 | 61 |
| (...skipping 1277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1339 | 1339 |
| 1340 ExtensionApiTest::ResultCatcher result_catcher; | 1340 ExtensionApiTest::ResultCatcher result_catcher; |
| 1341 | 1341 |
| 1342 ASSERT_TRUE(launched_listener.WaitUntilSatisfied()); | 1342 ASSERT_TRUE(launched_listener.WaitUntilSatisfied()); |
| 1343 | 1343 |
| 1344 EXPECT_TRUE(result_catcher.GetNextResult()); | 1344 EXPECT_TRUE(result_catcher.GetNextResult()); |
| 1345 } | 1345 } |
| 1346 } | 1346 } |
| 1347 | 1347 |
| 1348 } // namespace extensions | 1348 } // namespace extensions |
| OLD | NEW |