| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h" | 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 597 ReleaseProfile(); | 597 ReleaseProfile(); |
| 598 // When coming here, the active user has already be changed so that we can | 598 // When coming here, the active user has already be changed so that we can |
| 599 // set it as active. | 599 // set it as active. |
| 600 AttachProfile(ProfileManager::GetActiveUserProfile()); | 600 AttachProfile(ProfileManager::GetActiveUserProfile()); |
| 601 // Update the V1 applications. | 601 // Update the V1 applications. |
| 602 browser_status_monitor_->ActiveUserChanged(user_email); | 602 browser_status_monitor_->ActiveUserChanged(user_email); |
| 603 // Switch the running applications to the new user. | 603 // Switch the running applications to the new user. |
| 604 for (auto& controller : app_window_controllers_) | 604 for (auto& controller : app_window_controllers_) |
| 605 controller->ActiveUserChanged(user_email); | 605 controller->ActiveUserChanged(user_email); |
| 606 // Update the user specific shell properties from the new user profile. | 606 // Update the user specific shell properties from the new user profile. |
| 607 // Shelf preferences are loaded in ChromeLauncherController::AttachProfile. |
| 607 UpdateAppLaunchersFromPref(); | 608 UpdateAppLaunchersFromPref(); |
| 608 SetShelfBehaviorsFromPrefs(); | |
| 609 SetVirtualKeyboardBehaviorFromPrefs(); | 609 SetVirtualKeyboardBehaviorFromPrefs(); |
| 610 | 610 |
| 611 // Restore the order of running, but unpinned applications for the activated | 611 // Restore the order of running, but unpinned applications for the activated |
| 612 // user. | 612 // user. |
| 613 RestoreUnpinnedRunningApplicationOrder(user_email); | 613 RestoreUnpinnedRunningApplicationOrder(user_email); |
| 614 // Inform the system tray of the change. | 614 // Inform the system tray of the change. |
| 615 ash::WmShell::Get()->system_tray_delegate()->ActiveUserWasChanged(); | 615 ash::WmShell::Get()->system_tray_delegate()->ActiveUserWasChanged(); |
| 616 // Force on-screen keyboard to reset. | 616 // Force on-screen keyboard to reset. |
| 617 if (keyboard::IsKeyboardEnabled()) | 617 if (keyboard::IsKeyboardEnabled()) |
| 618 ash::Shell::GetInstance()->CreateKeyboard(); | 618 ash::Shell::GetInstance()->CreateKeyboard(); |
| (...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1480 LauncherItemController* controller = GetLauncherItemController(item.id); | 1480 LauncherItemController* controller = GetLauncherItemController(item.id); |
| 1481 if (!controller || controller->image_set_by_controller()) | 1481 if (!controller || controller->image_set_by_controller()) |
| 1482 continue; | 1482 continue; |
| 1483 item.image = image; | 1483 item.image = image; |
| 1484 if (arc_deferred_launcher_) | 1484 if (arc_deferred_launcher_) |
| 1485 arc_deferred_launcher_->MaybeApplySpinningEffect(id, &item.image); | 1485 arc_deferred_launcher_->MaybeApplySpinningEffect(id, &item.image); |
| 1486 model_->Set(index, item); | 1486 model_->Set(index, item); |
| 1487 // It's possible we're waiting on more than one item, so don't break. | 1487 // It's possible we're waiting on more than one item, so don't break. |
| 1488 } | 1488 } |
| 1489 } | 1489 } |
| OLD | NEW |