diff options
| author | oshima <oshima@chromium.org> | 2014-09-23 21:45:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-24 04:46:18 +0000 |
| commit | 828338e278350941febbfbede2b34d721be6dab1 (patch) | |
| tree | 7422846a9cd180ecc089b570ed0173db5f564e3f /athena/content | |
| parent | 10c902754f40ffe3d7ff1685293e6f5b16b809f3 (diff) | |
| download | chromium_src-828338e278350941febbfbede2b34d721be6dab1.zip chromium_src-828338e278350941febbfbede2b34d721be6dab1.tar.gz chromium_src-828338e278350941febbfbede2b34d721be6dab1.tar.bz2 | |
rename WidnowManager::GetInstance -> ::Get
call OnTerminating in unit test.
BUG=None
Review URL: https://codereview.chromium.org/599683003
Cr-Commit-Position: refs/heads/master@{#296348}
Diffstat (limited to 'athena/content')
| -rw-r--r-- | athena/content/app_activity.cc | 2 | ||||
| -rw-r--r-- | athena/content/app_activity_proxy.cc | 2 | ||||
| -rw-r--r-- | athena/content/app_activity_registry.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/athena/content/app_activity.cc b/athena/content/app_activity.cc index da5f929..4315df3 100644 --- a/athena/content/app_activity.cc +++ b/athena/content/app_activity.cc @@ -103,7 +103,7 @@ void AppActivity::Init() { // Note: At this time the |AppActivity| did not get registered to the // |ResourceManager| - so we can move it around if needed. WindowListProvider* window_list_provider = - WindowManager::GetInstance()->GetWindowListProvider(); + WindowManager::Get()->GetWindowListProvider(); window_list_provider->StackWindowFrontOf(app_proxy->GetWindow(), GetWindow()); Activity::Delete(app_proxy); diff --git a/athena/content/app_activity_proxy.cc b/athena/content/app_activity_proxy.cc index 60822d3..e4efd89 100644 --- a/athena/content/app_activity_proxy.cc +++ b/athena/content/app_activity_proxy.cc @@ -62,7 +62,7 @@ void AppActivityProxy::Init() { // Get the content proxy to present the content. content_proxy_ = replaced_activity_->GetContentProxy(GetWindow()); WindowListProvider* window_list_provider = - WindowManager::GetInstance()->GetWindowListProvider(); + WindowManager::Get()->GetWindowListProvider(); window_list_provider->StackWindowBehindTo(GetWindow(), replaced_activity_->GetWindow()); // Creating this object was moving the activation to this window which should diff --git a/athena/content/app_activity_registry.cc b/athena/content/app_activity_registry.cc index 70c1f3b..9981437 100644 --- a/athena/content/app_activity_registry.cc +++ b/athena/content/app_activity_registry.cc @@ -119,7 +119,7 @@ void AppActivityRegistry::DelayedUnload() { AppActivity* AppActivityRegistry::GetMruActivity() { DCHECK(activity_list_.size()); WindowListProvider* window_list_provider = - WindowManager::GetInstance()->GetWindowListProvider(); + WindowManager::Get()->GetWindowListProvider(); const aura::Window::Windows& children = window_list_provider->GetWindowList(); // Find the first window in the container which is part of the application. |