trunk/src/athena/main/athena_launcher.cc - Issue 497013002: Revert 291221 "Athena: Adding basic resource management framewor..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/athena/main/athena_launcher.cc

Issue 497013002: Revert 291221 "Athena: Adding basic resource management framewor..." (Closed) Base URL: svn://svn.chromium.org/chrome/

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:

Index: trunk/src/athena/main/athena_launcher.cc

===================================================================

--- trunk/src/athena/main/athena_launcher.cc (revision 291367)

+++ trunk/src/athena/main/athena_launcher.cc (working copy)

@@ -6,7 +6,6 @@

#include "athena/activity/public/activity_factory.h"

#include "athena/activity/public/activity_manager.h"

-#include "athena/content/public/app_registry.h"

#include "athena/content/public/content_activity_factory.h"

#include "athena/content/public/content_app_model_builder.h"

#include "athena/home/public/home_card.h"

@@ -120,7 +119,6 @@

athena::InputManager::Create()->OnRootWindowCreated(root_window);

athena::ScreenManager::Create(delegate, root_window);

athena::WindowManager::Create();

- athena::AppRegistry::Create();

SetupBackgroundImage();

athena::ScreenManager::Get()->GetContext()->SetProperty(

@@ -153,7 +151,6 @@

athena::ActivityFactory::Shutdown();

athena::ActivityManager::Shutdown();

athena::HomeCard::Shutdown();

- athena::AppRegistry::ShutDown();

athena::WindowManager::Shutdown();

athena::ScreenManager::Shutdown();

athena::InputManager::Shutdown();

« no previous file with comments | « trunk/src/athena/content/web_activity.cc ('k') | trunk/src/athena/main/athena_main.gyp » ('j') | no next file with comments »