Index: chrome/browser/extensions/platform_app_browsertest_util.h |
diff --git a/chrome/browser/extensions/platform_app_browsertest_util.h b/chrome/browser/extensions/platform_app_browsertest_util.h |
index d6147c74b798c0de58ec6bdbcfdbeb110362e724..6cc179b1ab46268a61243f41fa8f3ebda7cbc698 100644 |
--- a/chrome/browser/extensions/platform_app_browsertest_util.h |
+++ b/chrome/browser/extensions/platform_app_browsertest_util.h |
@@ -6,15 +6,14 @@ |
#define CHROME_BROWSER_EXTENSIONS_PLATFORM_APP_BROWSERTEST_UTIL_H_ |
+#include "apps/shell_window.h" |
#include "chrome/browser/extensions/extension_apitest.h" |
-#include "chrome/browser/ui/extensions/shell_window.h" |
namespace content { |
class WebContents; |
} |
class CommandLine; |
-class ShellWindow; |
namespace extensions { |
class Extension; |
@@ -41,7 +40,7 @@ class PlatformAppBrowserTest : public ExtensionApiTest { |
// Gets the first shell window that is found (most tests only deal with one |
// platform app window, so this is good enough). |
- ShellWindow* GetFirstShellWindow(); |
+ apps::ShellWindow* GetFirstShellWindow(); |
// Runs chrome.windows.getAll for the given extension and returns the number |
// of windows that the function returns. |
@@ -64,17 +63,18 @@ class PlatformAppBrowserTest : public ExtensionApiTest { |
void SetCommandLineArg(const std::string& test_file); |
// Creates an empty shell window for |extension|. |
- ShellWindow* CreateShellWindow(const Extension* extension); |
+ apps::ShellWindow* CreateShellWindow(const Extension* extension); |
- ShellWindow* CreateShellWindowFromParams( |
- const Extension* extension, const ShellWindow::CreateParams& params); |
+ apps::ShellWindow* CreateShellWindowFromParams( |
+ const Extension* extension, |
+ const apps::ShellWindow::CreateParams& params); |
// Closes |window| and waits until it's gone. |
- void CloseShellWindow(ShellWindow* window); |
+ void CloseShellWindow(apps::ShellWindow* window); |
// Call AdjustBoundsToBeVisibleOnScreen of |window|. |
void CallAdjustBoundsToBeVisibleOnScreenForShellWindow( |
- ShellWindow* window, |
+ apps::ShellWindow* window, |
const gfx::Rect& cached_bounds, |
const gfx::Rect& cached_screen_bounds, |
const gfx::Rect& current_screen_bounds, |
@@ -87,6 +87,6 @@ class ExperimentalPlatformAppBrowserTest : public PlatformAppBrowserTest { |
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; |
}; |
-} // namespace extensions |
+} // namespace extensions |
#endif // CHROME_BROWSER_EXTENSIONS_PLATFORM_APP_BROWSERTEST_UTIL_H_ |