OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/extensions/platform_app_browsertest_util.h" | 5 #include "chrome/browser/extensions/platform_app_browsertest_util.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
9 #include "chrome/browser/extensions/api/tabs/tabs.h" | 9 #include "chrome/browser/extensions/api/tabs/tabs.h" |
10 #include "chrome/browser/extensions/extension_function_test_utils.h" | 10 #include "chrome/browser/extensions/extension_function_test_utils.h" |
11 #include "chrome/browser/extensions/shell_window_registry.h" | 11 #include "chrome/browser/extensions/shell_window_registry.h" |
12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
13 #include "chrome/browser/ui/extensions/application_launch.h" | 13 #include "chrome/browser/ui/extensions/application_launch.h" |
| 14 #include "chrome/browser/ui/extensions/native_shell_window.h" |
14 #include "chrome/browser/ui/extensions/shell_window.h" | 15 #include "chrome/browser/ui/extensions/shell_window.h" |
15 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
16 #include "content/public/browser/notification_service.h" | 17 #include "content/public/browser/notification_service.h" |
17 #include "content/public/test/test_utils.h" | 18 #include "content/public/test/test_utils.h" |
18 | 19 |
19 using content::WebContents; | 20 using content::WebContents; |
20 | 21 |
21 namespace utils = extension_function_test_utils; | 22 namespace utils = extension_function_test_utils; |
22 | 23 |
23 namespace extensions { | 24 namespace extensions { |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 | 146 |
146 void PlatformAppBrowserTest::CloseShellWindow(ShellWindow* window) { | 147 void PlatformAppBrowserTest::CloseShellWindow(ShellWindow* window) { |
147 content::WindowedNotificationObserver destroyed_observer( | 148 content::WindowedNotificationObserver destroyed_observer( |
148 content::NOTIFICATION_WEB_CONTENTS_DESTROYED, | 149 content::NOTIFICATION_WEB_CONTENTS_DESTROYED, |
149 content::NotificationService::AllSources()); | 150 content::NotificationService::AllSources()); |
150 window->GetBaseWindow()->Close(); | 151 window->GetBaseWindow()->Close(); |
151 destroyed_observer.Wait(); | 152 destroyed_observer.Wait(); |
152 } | 153 } |
153 | 154 |
154 } // namespace extensions | 155 } // namespace extensions |
OLD | NEW |