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

Unified Diff: athena/main/athena_launcher.cc

Issue 483363003: [Athena] Add status icons and system time to the desktop background (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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/common/container_priorities.h ('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_launcher.cc
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
index e3470bff67e13dc737f1e327b78d76882eb8694b..50e9df24b470f5aa8edc95532bc3703cd4904e75 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -13,7 +13,6 @@
#include "athena/extensions/public/extensions_delegate.h"
#include "athena/home/public/home_card.h"
#include "athena/input/public/input_manager.h"
-#include "athena/main/debug/debug_window.h"
#include "athena/main/placeholder.h"
#include "athena/main/placeholder.h"
#include "athena/main/url_search_provider.h"
@@ -119,9 +118,9 @@ void StartAthenaEnv(scoped_refptr<base::TaskRunner> file_runner) {
aura::client::SetVisibilityClient(root_window,
env_state->visibility_client.get());
- athena::SystemUI::Create(file_runner);
athena::InputManager::Create()->OnRootWindowCreated(root_window);
athena::ScreenManager::Create(root_window);
+ athena::SystemUI::Create(file_runner);
athena::WindowManager::Create();
athena::AppRegistry::Create();
SetupBackgroundImage();
@@ -142,7 +141,6 @@ void StartAthenaSessionWithContext(content::BrowserContext* context) {
env_state->virtual_keyboard_observer.reset(new VirtualKeyboardObserver);
CreateTestPages(context);
- CreateDebugWindow();
}
void StartAthenaSession(athena::ActivityFactory* activity_factory,
@@ -160,9 +158,9 @@ void ShutdownAthena() {
athena::HomeCard::Shutdown();
athena::AppRegistry::ShutDown();
athena::WindowManager::Shutdown();
+ athena::SystemUI::Shutdown();
athena::ScreenManager::Shutdown();
athena::InputManager::Shutdown();
- athena::SystemUI::Shutdown();
athena::ExtensionsDelegate::Shutdown();
athena::AthenaEnv::Shutdown();
« no previous file with comments | « athena/common/container_priorities.h ('k') | athena/main/athena_main.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698