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

Unified Diff: athena/extensions/chrome/athena_apps_client.cc

Issue 544953003: Supprot V2 app: step1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 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
« no previous file with comments | « athena/extensions/chrome/athena_app_delegate.cc ('k') | athena/main/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/extensions/chrome/athena_apps_client.cc
diff --git a/athena/extensions/chrome/athena_apps_client.cc b/athena/extensions/chrome/athena_apps_client.cc
index 5339ff43df564539d9d12012a2ef4d8af59ab18f..37a0531f147a2e89ccd309e3face473f18938e97 100644
--- a/athena/extensions/chrome/athena_apps_client.cc
+++ b/athena/extensions/chrome/athena_apps_client.cc
@@ -6,11 +6,11 @@
#include "athena/activity/public/activity_factory.h"
#include "athena/activity/public/activity_manager.h"
+#include "athena/extensions/chrome/athena_app_delegate.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/browser/ui/apps/chrome_app_delegate.h"
#include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h"
#include "chrome/common/extensions/features/feature_channel.h"
#include "extensions/browser/app_window/app_window.h"
@@ -35,7 +35,7 @@ AthenaAppsClient::GetLoadedBrowserContexts() {
extensions::AppWindow* AthenaAppsClient::CreateAppWindow(
content::BrowserContext* context,
const extensions::Extension* extension) {
- return new extensions::AppWindow(context, new ChromeAppDelegate, extension);
+ return new extensions::AppWindow(context, new AthenaAppDelegate, extension);
}
extensions::NativeAppWindow* AthenaAppsClient::CreateNativeAppWindow(
« no previous file with comments | « athena/extensions/chrome/athena_app_delegate.cc ('k') | athena/main/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698