OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/native_app_window.h" | |
6 #include "apps/shell_window.h" | 5 #include "apps/shell_window.h" |
7 #include "apps/shell_window_registry.h" | 6 #include "apps/shell_window_registry.h" |
| 7 #include "apps/ui/native_app_window.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/location.h" | 11 #include "base/location.h" |
12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
13 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
14 #include "base/path_service.h" | 14 #include "base/path_service.h" |
15 #include "chrome/browser/browser_process.h" | 15 #include "chrome/browser/browser_process.h" |
16 #include "chrome/browser/chrome_browser_main.h" | 16 #include "chrome/browser/chrome_browser_main.h" |
17 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 17 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
761 window->GetBaseWindow()->Close(); | 761 window->GetBaseWindow()->Close(); |
762 content::RunAllPendingInMessageLoop(); | 762 content::RunAllPendingInMessageLoop(); |
763 } | 763 } |
764 | 764 |
765 // Disabled due to failures; http://crbug.com/306611. | 765 // Disabled due to failures; http://crbug.com/306611. |
766 INSTANTIATE_TEST_CASE_P(DISABLED_KioskEnterpriseTestInstantiation, | 766 INSTANTIATE_TEST_CASE_P(DISABLED_KioskEnterpriseTestInstantiation, |
767 KioskEnterpriseTest, | 767 KioskEnterpriseTest, |
768 testing::Bool()); | 768 testing::Bool()); |
769 | 769 |
770 } // namespace chromeos | 770 } // namespace chromeos |
OLD | NEW |