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

Unified Diff: athena/main/athena_launcher.cc

Issue 465803002: Make the minimized home card not overlap activities on Athena (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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: athena/main/athena_launcher.cc
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
index 04b55a77f2981ad82955f8b15ebdfe329f1622e3..1542a227f79add00d931a71a32fa6bea2bb46ca5 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -54,6 +54,7 @@ class AthenaViewsDelegate : public views::ViewsDelegate {
};
void StartAthena(aura::Window* root_window,
+ athena::ScreenManagerDelegate* delegate,
athena::ActivityFactory* activity_factory,
athena::AppModelBuilder* app_model_builder) {
#if defined(USE_X11)
@@ -71,7 +72,7 @@ void StartAthena(aura::Window* root_window,
athena::SystemUI::Create();
athena::InputManager::Create()->OnRootWindowCreated(root_window);
- athena::ScreenManager::Create(root_window);
+ athena::ScreenManager::Create(delegate, root_window);
athena::WindowManager::Create();
athena::HomeCard::Create(app_model_builder);
athena::ActivityManager::Create();

Powered by Google App Engine
This is Rietveld 408576698