diff options
author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 10:21:21 +0000 |
---|---|---|
committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 10:23:54 +0000 |
commit | b48fe9eef7e42d61be675211ee98b7cc18fa941a (patch) | |
tree | a2443eae0cbf7db1ee71d5d736d602853c549c8c /athena/test/test_app_content_control_delegate_impl.cc | |
parent | a9ca8d58432a4312b98a2e3bb0c90443bce839c6 (diff) | |
download | chromium_src-b48fe9eef7e42d61be675211ee98b7cc18fa941a.zip chromium_src-b48fe9eef7e42d61be675211ee98b7cc18fa941a.tar.gz chromium_src-b48fe9eef7e42d61be675211ee98b7cc18fa941a.tar.bz2 |
Revert 291221 "Athena: Adding basic resource management framewor..."
Reason: Failure on ASAN build bots.
https://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASan%20LSan%20Tests%20(3)/builds/2854/steps/athena_unittests/logs/OneAppActivity
> Athena: Adding basic resource management framework (un-/re-loading) of V2 applications
>
> Functionality:
>
> The |AppRegistry| has for each running application an |AppActivityRegistry|.
>
> The |AppActivityRegistry| knows all activities associated with the application it represents.
> It can furthermore shut the app entirely down upon resource manager request. It will then create
> an |AppActivityProxy| for the overview mode which shows a placeholder for an unloaded app. This
> placeholder can then ask the |AppActivityRegistry| to restart the application again.
>
> A shutdown request for the application is only performed when all activities were marked for
> UNLOAD.
>
> If there were multiple activities upon shutdown for one app, the app has to take care of
> re-creating all windows and thus re-creating all activities. Since an activity match cannot
> be performed, the |AppActivityProxy| will only be shown once and it will show in the location
> of the most recently used activity of that app. If we later on find an app which really uses
> multiple windows and it is imperative to keep the history for all of them tact & the app is
> recreating them properly, (a lot of if's) we can revisit the single |AppActivityProxy| and
> try to address it in a cleaner way, but at this time that seems rather un-useful since it is
> not known if required.
>
> BUG=388085
> TEST=AppActivityTest.*
>
> Review URL: https://codereview.chromium.org/477523002
TBR=skuhne@chromium.org
Review URL: https://codereview.chromium.org/497013002
Cr-Commit-Position: refs/heads/master@{#291370}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291370 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena/test/test_app_content_control_delegate_impl.cc')
-rw-r--r-- | athena/test/test_app_content_control_delegate_impl.cc | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/athena/test/test_app_content_control_delegate_impl.cc b/athena/test/test_app_content_control_delegate_impl.cc deleted file mode 100644 index 0cecfec..0000000 --- a/athena/test/test_app_content_control_delegate_impl.cc +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "athena/content/public/app_content_control_delegate.h" - -namespace athena { - -class AppContentControlDelegateImpl : public AppContentControlDelegate { - public: - AppContentControlDelegateImpl() {} - virtual ~AppContentControlDelegateImpl() {} - - virtual bool UnloadApplication( - const std::string& app_id, - content::BrowserContext* browser_context) OVERRIDE; - virtual bool RestartApplication( - const std::string& app_id, - content::BrowserContext* browser_context) OVERRIDE; - virtual std::string GetApplicationID( - content::WebContents* web_contents) OVERRIDE; - - private: - DISALLOW_COPY_AND_ASSIGN(AppContentControlDelegateImpl); -}; - -bool AppContentControlDelegateImpl::UnloadApplication( - const std::string& app_id, - content::BrowserContext* browser_context) { - // TODO(skuhne): Use the extension system to unload - // (|ExtensionService::TerminateExtension|) once it becomes available in - // Athena. - return false; -} - -bool AppContentControlDelegateImpl::RestartApplication( - const std::string& app_id, - content::BrowserContext* browser_context) { - return false; -} - -std::string AppContentControlDelegateImpl::GetApplicationID( - content::WebContents* web_contents) { - return std::string(); -} - -// static -AppContentControlDelegate* -AppContentControlDelegate::CreateAppContentControlDelegate() { - return new AppContentControlDelegateImpl; -} - -} // namespace athena |