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 #ifndef CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_ | 5 #ifndef CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_ |
6 #define CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_ | 6 #define CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_ |
7 | 7 |
8 | 8 |
9 #include "apps/shell_window.h" | 9 #include "apps/shell_window.h" |
10 #include "chrome/browser/extensions/extension_apitest.h" | 10 #include "chrome/browser/extensions/extension_apitest.h" |
| 11 #include "content/public/common/page_transition_types.h" |
11 | 12 |
12 namespace content { | 13 namespace content { |
13 class WebContents; | 14 class WebContents; |
14 } | 15 } |
15 | 16 |
16 class CommandLine; | 17 class CommandLine; |
17 | 18 |
18 namespace extensions { | 19 namespace extensions { |
19 class Extension; | 20 class Extension; |
20 | 21 |
21 class PlatformAppBrowserTest : public ExtensionApiTest { | 22 class PlatformAppBrowserTest : public ExtensionApiTest { |
22 public: | 23 public: |
23 PlatformAppBrowserTest(); | 24 PlatformAppBrowserTest(); |
24 | 25 |
25 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; | 26 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; |
26 | 27 |
27 protected: | 28 protected: |
28 // Runs the app named |name| out of the platform_apps subdirectory. Waits | 29 // Runs the app named |name| out of the platform_apps subdirectory. Waits |
29 // until it is launched. | 30 // until it is launched. |
30 const Extension* LoadAndLaunchPlatformApp(const char* name); | 31 const Extension* LoadAndLaunchPlatformApp(const char* name); |
31 | 32 |
| 33 // Installs the app named |name| out of the platform_apps subdirectory. |
| 34 const Extension* InstallPlatformApp(const char* name); |
| 35 |
32 // Installs and runs the app named |name| out of the platform_apps | 36 // Installs and runs the app named |name| out of the platform_apps |
33 // subdirectory. Waits until it is launched. | 37 // subdirectory. Waits until it is launched. |
34 const Extension* InstallAndLaunchPlatformApp(const char* name); | 38 const Extension* InstallAndLaunchPlatformApp(const char* name); |
35 | 39 |
36 // Gets the WebContents associated with the first shell window that is found | 40 // Gets the WebContents associated with the first shell window that is found |
37 // (most tests only deal with one platform app window, so this is good | 41 // (most tests only deal with one platform app window, so this is good |
38 // enough). | 42 // enough). |
39 content::WebContents* GetFirstShellWindowWebContents(); | 43 content::WebContents* GetFirstShellWindowWebContents(); |
40 | 44 |
41 // Gets the first shell window that is found (most tests only deal with one | 45 // Gets the first shell window that is found (most tests only deal with one |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 }; | 87 }; |
84 | 88 |
85 class ExperimentalPlatformAppBrowserTest : public PlatformAppBrowserTest { | 89 class ExperimentalPlatformAppBrowserTest : public PlatformAppBrowserTest { |
86 public: | 90 public: |
87 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; | 91 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; |
88 }; | 92 }; |
89 | 93 |
90 } // namespace extensions | 94 } // namespace extensions |
91 | 95 |
92 #endif // CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_ | 96 #endif // CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_ |
OLD | NEW |