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/launcher.h" | 7 #include "apps/launcher.h" |
8 #include "apps/ui/native_app_window.h" | 8 #include "apps/ui/native_app_window.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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/user_manager.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_dbus_thread_manager.h" | 55 #include "chromeos/dbus/fake_dbus_thread_manager.h" |
56 #include "chromeos/dbus/fake_power_manager_client.h" | 56 #include "chromeos/dbus/fake_power_manager_client.h" |
| 57 #include "components/user_manager/user_manager.h" |
57 #endif | 58 #endif |
58 | 59 |
59 using apps::AppWindow; | 60 using apps::AppWindow; |
60 using apps::AppWindowRegistry; | 61 using apps::AppWindowRegistry; |
61 using content::WebContents; | 62 using content::WebContents; |
62 using web_modal::WebContentsModalDialogManager; | 63 using web_modal::WebContentsModalDialogManager; |
63 | 64 |
64 namespace app_runtime = extensions::core_api::app_runtime; | 65 namespace app_runtime = extensions::core_api::app_runtime; |
65 | 66 |
66 namespace extensions { | 67 namespace extensions { |
(...skipping 1217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1284 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched"); | 1285 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched"); |
1285 ASSERT_TRUE(extension); | 1286 ASSERT_TRUE(extension); |
1286 ASSERT_EQ(extension_id, extension->id()); | 1287 ASSERT_EQ(extension_id, extension->id()); |
1287 | 1288 |
1288 ExtensionApiTest::ResultCatcher result_catcher; | 1289 ExtensionApiTest::ResultCatcher result_catcher; |
1289 EXPECT_TRUE(result_catcher.GetNextResult()); | 1290 EXPECT_TRUE(result_catcher.GetNextResult()); |
1290 } | 1291 } |
1291 } | 1292 } |
1292 | 1293 |
1293 } // namespace extensions | 1294 } // namespace extensions |
OLD | NEW |