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

Unified Diff: athena/main/athena_main.cc

Issue 287163009: [Athena] minimum impl to add screen/background and test windows (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/athena_main.gyp » ('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 3a334d72b74ab5cbcdf34cf7c56b055fd025895e..8e8cc63a7b8a55ec1a6ee3781f9245e26a25202b 100644
--- a/athena/main/athena_main.cc
+++ b/athena/main/athena_main.cc
@@ -4,7 +4,12 @@
#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/main/placeholder.h"
+#include "athena/screen/public/screen_manager.h"
+#include "athena/wm/public/window_manager.h"
#include "content/public/app/content_main.h"
+#include "ui/aura/window_tree_host.h"
class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
public:
@@ -12,8 +17,20 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
virtual ~AthenaBrowserMainDelegate() {}
// apps::ShellBrowserMainDelegate:
- virtual void Start(content::BrowserContext* context) OVERRIDE {}
- virtual void Shutdown() OVERRIDE {}
+ virtual void Start(content::BrowserContext* context) OVERRIDE {
+ athena::ScreenManager::Create(apps::ShellDesktopController::instance()
+ ->GetWindowTreeHost()
+ ->window());
+ athena::WindowManager::Create();
+
+ SetupBackgroundImage();
+ CreateTestWindows();
+ }
+
+ virtual void Shutdown() OVERRIDE {
+ athena::WindowManager::Shutdown();
+ athena::ScreenManager::Shutdown();
+ }
private:
DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate);
« no previous file with comments | « athena/main/DEPS ('k') | athena/main/athena_main.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698