Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1289)

Unified Diff: chrome/browser/ui/apps/chrome_apps_client.cc

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unneeded include in chrome_shell_delegate.cc Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
« no previous file with comments | « chrome/browser/ui/apps/chrome_apps_client.h ('k') | chrome/browser/ui/ash/accelerator_commands_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698