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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: athena/main/athena_launcher.cc

Issue 498023003: Delete activity upon window deletion (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reformat 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
« athena/activity/activity_view_manager_impl.cc ('K') | « athena/extensions/shell/extensions_delegate_impl.cc ('k') | athena/main/athena_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/main/athena_launcher.cc
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
index 700b869304a458e3c7368aa46409d4113d5fd65f..149bd2e037d00c60aa059bccb9a92cfd6d87004a 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -87,6 +87,7 @@ class AthenaViewsDelegate : public views::ViewsDelegate {
virtual void OnBeforeWidgetInit(
views::Widget::InitParams* params,
views::internal::NativeWidgetDelegate* delegate) OVERRIDE {
+ params->context = athena::ScreenManager::Get()->GetContext();
}
DISALLOW_COPY_AND_ASSIGN(AthenaViewsDelegate);
@@ -127,7 +128,6 @@ void StartAthenaEnv(aura::Window* root_window,
}
void StartAthenaSessionWithContext(content::BrowserContext* context) {
- athena::ExtensionsDelegate::CreateExtensionsDelegateForShell(context);
StartAthenaSession(new athena::ContentActivityFactory(),
new athena::ContentAppModelBuilder(context));
athena::VirtualKeyboardManager::Create(context);
« athena/activity/activity_view_manager_impl.cc ('K') | « athena/extensions/shell/extensions_delegate_impl.cc ('k') | athena/main/athena_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698