| Index: chrome/browser/ui/apps/chrome_apps_client.cc
|
| diff --git a/chrome/browser/ui/apps/chrome_apps_client.cc b/chrome/browser/ui/apps/chrome_apps_client.cc
|
| index 1760a6df9c2da71876eabde0f503ada21d5b9e84..80ffedcd2b666fd7977b2fd0ea952f2178530061 100644
|
| --- a/chrome/browser/ui/apps/chrome_apps_client.cc
|
| +++ b/chrome/browser/ui/apps/chrome_apps_client.cc
|
| @@ -4,12 +4,12 @@
|
|
|
| #include "chrome/browser/ui/apps/chrome_apps_client.h"
|
|
|
| -#include "apps/app_window.h"
|
| #include "base/memory/singleton.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/devtools/devtools_window.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/common/extensions/features/feature_channel.h"
|
| +#include "extensions/browser/app_window/app_window.h"
|
| #include "extensions/common/extension.h"
|
|
|
| // TODO(jamescook): We probably shouldn't compile this class at all on Android.
|
| @@ -39,19 +39,19 @@ ChromeAppsClient::GetLoadedBrowserContexts() {
|
| profiles.end());
|
| }
|
|
|
| -apps::AppWindow* ChromeAppsClient::CreateAppWindow(
|
| +extensions::AppWindow* ChromeAppsClient::CreateAppWindow(
|
| content::BrowserContext* context,
|
| const extensions::Extension* extension) {
|
| #if defined(OS_ANDROID)
|
| return NULL;
|
| #else
|
| - return new apps::AppWindow(context, new ChromeAppDelegate, extension);
|
| + return new extensions::AppWindow(context, new ChromeAppDelegate, extension);
|
| #endif
|
| }
|
|
|
| extensions::NativeAppWindow* ChromeAppsClient::CreateNativeAppWindow(
|
| - apps::AppWindow* window,
|
| - const apps::AppWindow::CreateParams& params) {
|
| + extensions::AppWindow* window,
|
| + const extensions::AppWindow::CreateParams& params) {
|
| #if defined(OS_ANDROID)
|
| return NULL;
|
| #else
|
|
|