| Index: athena/content/app_activity_registry.h
|
| diff --git a/athena/content/app_activity_registry.h b/athena/content/app_activity_registry.h
|
| index 14ef7de3945ba25b7e9ec445b63f1b786f07307b..76ccccc9479ed84b8d0c4156de8a6a6c1e927ef6 100644
|
| --- a/athena/content/app_activity_registry.h
|
| +++ b/athena/content/app_activity_registry.h
|
| @@ -57,9 +57,9 @@ class ATHENA_EXPORT AppActivityRegistry {
|
| content::BrowserContext* browser_context() const { return browser_context_; }
|
| const std::string& app_id() const { return app_id_; }
|
|
|
| - AppActivityProxy* unloaded_activity_proxy_for_test() {
|
| - return unloaded_activity_proxy_;
|
| - }
|
| + // Returns the proxy - if there is one. This will get used by a newly created
|
| + // activity to position itself in its place before it get destroyed.
|
| + Activity* unloaded_activity_proxy() { return unloaded_activity_proxy_; }
|
|
|
| protected:
|
| friend AppActivityProxy;
|
| @@ -74,8 +74,8 @@ class ATHENA_EXPORT AppActivityRegistry {
|
| void RestartApplication(AppActivityProxy* proxy);
|
|
|
| private:
|
| - // Move the window before the most recently used application window.
|
| - void MoveBeforeMruApplicationWindow(aura::Window* window);
|
| + // Get the most recently used activity.
|
| + AppActivity* GetMruActivity();
|
|
|
| // A list of all activities associated with this application.
|
| std::vector<AppActivity*> activity_list_;
|
|
|