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

Side by Side Diff: athena/main/athena_main.cc

Issue 302683002: athena: Add the concept of Activity and related managers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « athena/main/athena_launcher.cc ('k') | athena/main/athena_main.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "apps/shell/app/shell_main_delegate.h" 5 #include "apps/shell/app/shell_main_delegate.h"
6 #include "apps/shell/browser/shell_browser_main_delegate.h" 6 #include "apps/shell/browser/shell_browser_main_delegate.h"
7 #include "apps/shell/browser/shell_desktop_controller.h" 7 #include "apps/shell/browser/shell_desktop_controller.h"
8 #include "athena/main/athena_launcher.h" 8 #include "athena/main/athena_launcher.h"
9 #include "athena/main/placeholder.h" 9 #include "athena/main/placeholder.h"
10 #include "athena/main/placeholder_content.h"
10 #include "content/public/app/content_main.h" 11 #include "content/public/app/content_main.h"
11 #include "ui/aura/window_tree_host.h" 12 #include "ui/aura/window_tree_host.h"
12 #include "ui/wm/core/visibility_controller.h" 13 #include "ui/wm/core/visibility_controller.h"
13 14
14 class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate { 15 class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
15 public: 16 public:
16 AthenaBrowserMainDelegate() {} 17 AthenaBrowserMainDelegate() {}
17 virtual ~AthenaBrowserMainDelegate() {} 18 virtual ~AthenaBrowserMainDelegate() {}
18 19
19 // apps::ShellBrowserMainDelegate: 20 // apps::ShellBrowserMainDelegate:
20 virtual void Start(content::BrowserContext* context) OVERRIDE { 21 virtual void Start(content::BrowserContext* context) OVERRIDE {
21 athena::StartAthena(apps::ShellDesktopController::instance() 22 athena::StartAthena(apps::ShellDesktopController::instance()
22 ->GetWindowTreeHost() 23 ->GetWindowTreeHost()
23 ->window()); 24 ->window());
24 CreateTestWindows(); 25 CreateTestWindows();
26 CreateTestPages(context);
25 } 27 }
26 28
27 virtual void Shutdown() OVERRIDE { athena::ShutdownAthena(); } 29 virtual void Shutdown() OVERRIDE { athena::ShutdownAthena(); }
28 30
29 private: 31 private:
30 DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate); 32 DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate);
31 }; 33 };
32 34
33 class AthenaMainDelegate : public apps::ShellMainDelegate { 35 class AthenaMainDelegate : public apps::ShellMainDelegate {
34 public: 36 public:
(...skipping 12 matching lines...) Expand all
47 49
48 int main(int argc, const char** argv) { 50 int main(int argc, const char** argv) {
49 AthenaMainDelegate delegate; 51 AthenaMainDelegate delegate;
50 content::ContentMainParams params(&delegate); 52 content::ContentMainParams params(&delegate);
51 53
52 params.argc = argc; 54 params.argc = argc;
53 params.argv = argv; 55 params.argv = argv;
54 56
55 return content::ContentMain(params); 57 return content::ContentMain(params);
56 } 58 }
OLDNEW
« no previous file with comments | « athena/main/athena_launcher.cc ('k') | athena/main/athena_main.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698