| Index: ash/system/user/tray_user.cc
|
| diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
|
| index adff775effd103e4e3e5fdf7401cb832dc4125d2..e8ea56e7680dc96d20b5de6a3213df683ce698e7 100644
|
| --- a/ash/system/user/tray_user.cc
|
| +++ b/ash/system/user/tray_user.cc
|
| @@ -134,8 +134,6 @@ void SwitchUser(ash::MultiProfileIndex user_index) {
|
| } // namespace
|
|
|
| namespace ash {
|
| -namespace internal {
|
| -
|
| namespace tray {
|
|
|
| // A custom image view with rounded edges.
|
| @@ -1356,14 +1354,12 @@ MultiProfileIndex TrayUser::GetTrayIndex() {
|
| }
|
|
|
| void TrayUser::UpdateLayoutOfItem() {
|
| - internal::RootWindowController* controller =
|
| - internal::GetRootWindowController(
|
| - system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow());
|
| + RootWindowController* controller = GetRootWindowController(
|
| + system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow());
|
| if (controller && controller->shelf()) {
|
| UpdateAfterShelfAlignmentChange(
|
| controller->GetShelfLayoutManager()->GetAlignment());
|
| }
|
| }
|
|
|
| -} // namespace internal
|
| } // namespace ash
|
|
|