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

Unified Diff: athena/main/athena_main.cc

Issue 287253003: Add initial home card impl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/main/DEPS ('k') | athena/main/placeholder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/main/athena_main.cc
diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc
index 8e8cc63a7b8a55ec1a6ee3781f9245e26a25202b..8c6e7aba36b2683b498e6639b33d4acc81cf5c66 100644
--- a/athena/main/athena_main.cc
+++ b/athena/main/athena_main.cc
@@ -5,11 +5,14 @@
#include "apps/shell/app/shell_main_delegate.h"
#include "apps/shell/browser/shell_browser_main_delegate.h"
#include "apps/shell/browser/shell_desktop_controller.h"
+#include "athena/home/public/home_card.h"
#include "athena/main/placeholder.h"
#include "athena/screen/public/screen_manager.h"
#include "athena/wm/public/window_manager.h"
+#include "base/memory/scoped_ptr.h"
#include "content/public/app/content_main.h"
#include "ui/aura/window_tree_host.h"
+#include "ui/wm/core/visibility_controller.h"
class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
public:
@@ -18,20 +21,29 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
// apps::ShellBrowserMainDelegate:
virtual void Start(content::BrowserContext* context) OVERRIDE {
- athena::ScreenManager::Create(apps::ShellDesktopController::instance()
- ->GetWindowTreeHost()
- ->window());
+ aura::Window* root_window =
+ apps::ShellDesktopController::instance()->GetWindowTreeHost()->window();
+ visibility_controller_.reset(new ::wm::VisibilityController);
+ aura::client::SetVisibilityClient(root_window,
+ visibility_controller_.get());
+
+ athena::ScreenManager::Create(root_window);
athena::WindowManager::Create();
+ athena::HomeCard::Create();
SetupBackgroundImage();
CreateTestWindows();
}
virtual void Shutdown() OVERRIDE {
+ athena::HomeCard::Shutdown();
athena::WindowManager::Shutdown();
athena::ScreenManager::Shutdown();
+ visibility_controller_.reset();
}
+ scoped_ptr< ::wm::VisibilityController> visibility_controller_;
+
private:
DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate);
};
« no previous file with comments | « athena/main/DEPS ('k') | athena/main/placeholder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698