athena/content/app_activity_registry.cc - Issue 513523002: Adding Baseframework of the ResourceManager (all hooks and observers) are being put in place with a…

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: athena/content/app_activity_registry.cc

Issue 513523002: Adding Baseframework of the ResourceManager (all hooks and observers) are being put in place with a… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Aaaand another rebase 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

Index: athena/content/app_activity_registry.cc

diff --git a/athena/content/app_activity_registry.cc b/athena/content/app_activity_registry.cc

index 6b3f0af00b491068408aacaf76ac79fd1a60772e..da28386659bf29484b4ff6ab9439592254579435 100644

--- a/athena/content/app_activity_registry.cc

+++ b/athena/content/app_activity_registry.cc

@@ -110,8 +110,7 @@ void AppActivityRegistry::RestartApplication(AppActivityProxy* proxy) {

DCHECK_EQ(unloaded_activity_proxy_, proxy);

// Restart the application.

ExtensionsDelegate::Get(browser_context_)->LaunchApp(app_id_);

- // Remove the activity from the Activity manager.

- ActivityManager::Get()->RemoveActivity(unloaded_activity_proxy_);

+ // Delete the activity which will also remove the it from the ActivityManager.

delete unloaded_activity_proxy_; // Will call ProxyDestroyed.

// After this call |this| might be gone if the app did not open a window yet.

}

« no previous file with comments | « athena/content/app_activity_proxy.cc ('k') | athena/content/web_activity.cc » ('j') | athena/wm/public/window_manager_observer.h » ('J')