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

Unified Diff: athena/main/athena_main.cc

Issue 335003003: Introduces AppActivity and handler of chrome.shell API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: AppWindowOwner Created 6 years, 6 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_main.cc
diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc
index 537e6621a99d24f764b034a97bfdd36b211f015d..7099bff9448d2215422aa3da4ef109d8c6b2726a 100644
--- a/athena/main/athena_main.cc
+++ b/athena/main/athena_main.cc
@@ -8,6 +8,7 @@
#include "apps/shell/browser/shell_extension_system.h"
#include "athena/content/public/content_activity_factory.h"
#include "athena/content/public/content_app_model_builder.h"
+#include "athena/main/athena_app_window_controller.h"
#include "athena/main/athena_launcher.h"
#include "athena/main/placeholder.h"
#include "base/command_line.h"
@@ -48,7 +49,9 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
virtual apps::ShellDesktopController* CreateDesktopController() OVERRIDE {
// TODO(mukai): create Athena's own ShellDesktopController subclass so that
// it can initialize its own window manager logic.
- return new apps::ShellDesktopController();
+ apps::ShellDesktopController* desktop = new apps::ShellDesktopController();
+ desktop->SetAppWindowController(new athena::AthenaAppWindowController());
+ return desktop;
}
private:

Powered by Google App Engine
This is Rietveld 408576698