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 #include "base/command_line.h" | 7 #include "base/command_line.h" |
7 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
| 9 #include "chrome/browser/extensions/api/tabs/tabs.h" |
8 #include "chrome/browser/extensions/extension_function_test_utils.h" | 10 #include "chrome/browser/extensions/extension_function_test_utils.h" |
9 #include "chrome/browser/extensions/extension_tabs_module.h" | |
10 #include "chrome/browser/extensions/shell_window_registry.h" | 11 #include "chrome/browser/extensions/shell_window_registry.h" |
11 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
12 #include "chrome/browser/ui/extensions/application_launch.h" | 13 #include "chrome/browser/ui/extensions/application_launch.h" |
13 #include "chrome/browser/ui/extensions/shell_window.h" | 14 #include "chrome/browser/ui/extensions/shell_window.h" |
14 #include "chrome/common/chrome_switches.h" | 15 #include "chrome/common/chrome_switches.h" |
15 #include "chrome/test/base/ui_test_utils.h" | 16 #include "chrome/test/base/ui_test_utils.h" |
16 #include "content/public/browser/notification_service.h" | 17 #include "content/public/browser/notification_service.h" |
17 | 18 |
18 using content::WebContents; | 19 using content::WebContents; |
19 using extensions::Extension; | 20 using extensions::Extension; |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 browser()->profile(), extension, GURL(""), params); | 115 browser()->profile(), extension, GURL(""), params); |
115 } | 116 } |
116 | 117 |
117 void PlatformAppBrowserTest::CloseShellWindow(ShellWindow* window) { | 118 void PlatformAppBrowserTest::CloseShellWindow(ShellWindow* window) { |
118 ui_test_utils::WindowedNotificationObserver destroyed_observer( | 119 ui_test_utils::WindowedNotificationObserver destroyed_observer( |
119 content::NOTIFICATION_WEB_CONTENTS_DESTROYED, | 120 content::NOTIFICATION_WEB_CONTENTS_DESTROYED, |
120 content::NotificationService::AllSources()); | 121 content::NotificationService::AllSources()); |
121 window->Close(); | 122 window->Close(); |
122 destroyed_observer.Wait(); | 123 destroyed_observer.Wait(); |
123 } | 124 } |
OLD | NEW |