diff options
Diffstat (limited to 'chrome/browser/apps/app_browsertest_util.cc')
| -rw-r--r-- | chrome/browser/apps/app_browsertest_util.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/apps/app_browsertest_util.cc b/chrome/browser/apps/app_browsertest_util.cc index 42fc891..2c61ffe 100644 --- a/chrome/browser/apps/app_browsertest_util.cc +++ b/chrome/browser/apps/app_browsertest_util.cc @@ -5,7 +5,6 @@ #include "chrome/browser/apps/app_browsertest_util.h" #include "apps/app_window_contents.h" -#include "apps/app_window_registry.h" #include "base/command_line.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/api/tabs/tabs_api.h" @@ -17,11 +16,10 @@ #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/app_window/app_window_registry.h" #include "extensions/browser/app_window/native_app_window.h" #include "extensions/common/switches.h" -using apps::AppWindow; -using apps::AppWindowRegistry; using content::WebContents; namespace { @@ -128,7 +126,7 @@ AppWindow* PlatformAppBrowserTest::GetFirstAppWindow() { return GetFirstAppWindowForBrowser(browser()); } -apps::AppWindow* PlatformAppBrowserTest::GetFirstAppWindowForApp( +AppWindow* PlatformAppBrowserTest::GetFirstAppWindowForApp( const std::string& app_id) { AppWindowRegistry* app_registry = AppWindowRegistry::Get(browser()->profile()); @@ -229,7 +227,7 @@ void PlatformAppBrowserTest::CallAdjustBoundsToBeVisibleOnScreenForAppWindow( bounds); } -apps::AppWindow* PlatformAppBrowserTest::CreateTestAppWindow( +AppWindow* PlatformAppBrowserTest::CreateTestAppWindow( const std::string& window_create_options) { ExtensionTestMessageListener launched_listener("launched", true); ExtensionTestMessageListener loaded_listener("window_loaded", false); |