| OLD | NEW |
| 1 /// Copyright 2014 The Chromium Authors. All rights reserved. | 1 /// Copyright 2014 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 "athena/activity/public/activity_factory.h" | 5 #include "athena/activity/public/activity_factory.h" |
| 6 #include "athena/activity/public/activity_manager.h" | 6 #include "athena/activity/public/activity_manager.h" |
| 7 #include "athena/content/app_activity.h" | 7 #include "athena/content/app_activity.h" |
| 8 #include "athena/content/app_activity_registry.h" | 8 #include "athena/content/app_activity_registry.h" |
| 9 #include "athena/content/public/app_content_control_delegate.h" | 9 #include "athena/content/public/app_content_control_delegate.h" |
| 10 #include "athena/content/public/app_registry.h" | 10 #include "athena/content/public/app_registry.h" |
| 11 #include "athena/test/athena_test_base.h" | 11 #include "athena/test/athena_test_base.h" |
| 12 #include "extensions/shell/browser/shell_app_window.h" | |
| 13 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
| 14 #include "ui/views/view.h" | 13 #include "ui/views/view.h" |
| 15 #include "ui/views/widget/widget.h" | 14 #include "ui/views/widget/widget.h" |
| 16 | 15 |
| 17 | 16 |
| 18 namespace content { | 17 namespace content { |
| 19 class BrowserContext; | 18 class BrowserContext; |
| 20 } | 19 } |
| 21 | 20 |
| 22 namespace athena { | 21 namespace athena { |
| (...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 403 activity_proxy->SetCurrentState(Activity::ACTIVITY_VISIBLE); | 402 activity_proxy->SetCurrentState(Activity::ACTIVITY_VISIBLE); |
| 404 EXPECT_EQ(1, test_app_content_control_delegate()->restart_called()); | 403 EXPECT_EQ(1, test_app_content_control_delegate()->restart_called()); |
| 405 | 404 |
| 406 // However - the restart in this test framework does not really restart and | 405 // However - the restart in this test framework does not really restart and |
| 407 // all objects should be gone now. | 406 // all objects should be gone now. |
| 408 EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications()); | 407 EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications()); |
| 409 } | 408 } |
| 410 | 409 |
| 411 } // namespace test | 410 } // namespace test |
| 412 } // namespace athena | 411 } // namespace athena |
| OLD | NEW |