| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index d7626ba38f01bfc7342c89e76ae45f4abe5fe11f..3cb781f6911644e5a2256e98b715ae30e224b966 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -486,12 +486,12 @@ void Shell::ShowShelf() {
|
| (*iter)->ShowShelf();
|
| }
|
|
|
| -void Shell::HideShelf() {
|
| +void Shell::ShutdownShelf() {
|
| RootWindowControllerList controllers = GetAllRootWindowControllers();
|
| for (RootWindowControllerList::iterator iter = controllers.begin();
|
| iter != controllers.end(); ++iter) {
|
| if ((*iter)->shelf())
|
| - (*iter)->shelf()->ShutdownStatusAreaWidget();
|
| + (*iter)->shelf()->Shutdown();
|
| }
|
| }
|
|
|
| @@ -754,7 +754,7 @@ Shell::~Shell() {
|
|
|
| // Destroy SystemTrayDelegate before destroying the status area(s). Make sure
|
| // to deinitialize the shelf first, as it is initialized after the delegate.
|
| - HideShelf();
|
| + ShutdownShelf();
|
| system_tray_delegate_->Shutdown();
|
| system_tray_delegate_.reset();
|
|
|
|
|