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

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

Issue 349353002: athena: Show network and battery status in the UI. (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 | « no previous file | 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 "apps/shell/browser/shell_extension_system.h" 8 #include "apps/shell/browser/shell_extension_system.h"
9 #include "apps/shell/renderer/shell_renderer_main_delegate.h" 9 #include "apps/shell/renderer/shell_renderer_main_delegate.h"
10 #include "athena/content/public/content_activity_factory.h" 10 #include "athena/content/public/content_activity_factory.h"
11 #include "athena/content/public/content_app_model_builder.h" 11 #include "athena/content/public/content_app_model_builder.h"
12 #include "athena/home/public/home_card.h" 12 #include "athena/home/public/home_card.h"
13 #include "athena/main/athena_app_window_controller.h" 13 #include "athena/main/athena_app_window_controller.h"
14 #include "athena/main/athena_launcher.h" 14 #include "athena/main/athena_launcher.h"
15 #include "athena/main/debug/debug_window.h"
15 #include "athena/main/placeholder.h" 16 #include "athena/main/placeholder.h"
16 #include "athena/main/url_search_provider.h" 17 #include "athena/main/url_search_provider.h"
17 #include "athena/virtual_keyboard/public/virtual_keyboard_bindings.h" 18 #include "athena/virtual_keyboard/public/virtual_keyboard_bindings.h"
18 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h" 19 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h"
19 #include "base/command_line.h" 20 #include "base/command_line.h"
20 #include "base/file_util.h" 21 #include "base/file_util.h"
21 #include "content/public/app/content_main.h" 22 #include "content/public/app/content_main.h"
22 #include "ui/aura/window_tree_host.h" 23 #include "ui/aura/window_tree_host.h"
23 #include "ui/wm/core/visibility_controller.h" 24 #include "ui/wm/core/visibility_controller.h"
24 25
(...skipping 29 matching lines...) Expand all
54 55
55 athena::StartAthena( 56 athena::StartAthena(
56 apps::ShellDesktopController::instance()->host()->window(), 57 apps::ShellDesktopController::instance()->host()->window(),
57 new athena::ContentActivityFactory(), 58 new athena::ContentActivityFactory(),
58 new athena::ContentAppModelBuilder(context)); 59 new athena::ContentAppModelBuilder(context));
59 athena::HomeCard::Get()->RegisterSearchProvider( 60 athena::HomeCard::Get()->RegisterSearchProvider(
60 new athena::UrlSearchProvider(context)); 61 new athena::UrlSearchProvider(context));
61 athena::VirtualKeyboardManager::Create(context); 62 athena::VirtualKeyboardManager::Create(context);
62 63
63 CreateTestPages(context); 64 CreateTestPages(context);
65 CreateDebugWindow();
64 } 66 }
65 67
66 virtual void Shutdown() OVERRIDE { athena::ShutdownAthena(); } 68 virtual void Shutdown() OVERRIDE { athena::ShutdownAthena(); }
67 69
68 virtual apps::ShellDesktopController* CreateDesktopController() OVERRIDE { 70 virtual apps::ShellDesktopController* CreateDesktopController() OVERRIDE {
69 // TODO(mukai): create Athena's own ShellDesktopController subclass so that 71 // TODO(mukai): create Athena's own ShellDesktopController subclass so that
70 // it can initialize its own window manager logic. 72 // it can initialize its own window manager logic.
71 apps::ShellDesktopController* desktop = new apps::ShellDesktopController(); 73 apps::ShellDesktopController* desktop = new apps::ShellDesktopController();
72 desktop->SetAppWindowController(new athena::AthenaAppWindowController()); 74 desktop->SetAppWindowController(new athena::AthenaAppWindowController());
73 return desktop; 75 return desktop;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 118
117 int main(int argc, const char** argv) { 119 int main(int argc, const char** argv) {
118 AthenaMainDelegate delegate; 120 AthenaMainDelegate delegate;
119 content::ContentMainParams params(&delegate); 121 content::ContentMainParams params(&delegate);
120 122
121 params.argc = argc; 123 params.argc = argc;
122 params.argv = argv; 124 params.argv = argv;
123 125
124 return content::ContentMain(params); 126 return content::ContentMain(params);
125 } 127 }
OLDNEW
« no previous file with comments | « no previous file | athena/main/athena_main.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698