| 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 597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 608 controller->ActiveUserChanged(user_email); | 608 controller->ActiveUserChanged(user_email); |
| 609 // Update the user specific shell properties from the new user profile. | 609 // Update the user specific shell properties from the new user profile. |
| 610 // Shelf preferences are loaded in ChromeLauncherController::AttachProfile. | 610 // Shelf preferences are loaded in ChromeLauncherController::AttachProfile. |
| 611 UpdateAppLaunchersFromPref(); | 611 UpdateAppLaunchersFromPref(); |
| 612 SetVirtualKeyboardBehaviorFromPrefs(); | 612 SetVirtualKeyboardBehaviorFromPrefs(); |
| 613 | 613 |
| 614 // Restore the order of running, but unpinned applications for the activated | 614 // Restore the order of running, but unpinned applications for the activated |
| 615 // user. | 615 // user. |
| 616 RestoreUnpinnedRunningApplicationOrder(user_email); | 616 RestoreUnpinnedRunningApplicationOrder(user_email); |
| 617 // Inform the system tray of the change. | 617 // Inform the system tray of the change. |
| 618 ash::WmShell::Get()->system_tray_delegate()->ActiveUserWasChanged(); | 618 ash::Shell::Get()->system_tray_delegate()->ActiveUserWasChanged(); |
| 619 // Force on-screen keyboard to reset. | 619 // Force on-screen keyboard to reset. |
| 620 if (keyboard::IsKeyboardEnabled()) | 620 if (keyboard::IsKeyboardEnabled()) |
| 621 ash::Shell::GetInstance()->CreateKeyboard(); | 621 ash::Shell::GetInstance()->CreateKeyboard(); |
| 622 } | 622 } |
| 623 | 623 |
| 624 void ChromeLauncherControllerImpl::AdditionalUserAddedToSession( | 624 void ChromeLauncherControllerImpl::AdditionalUserAddedToSession( |
| 625 Profile* profile) { | 625 Profile* profile) { |
| 626 // Switch the running applications to the new user. | 626 // Switch the running applications to the new user. |
| 627 for (auto& controller : app_window_controllers_) | 627 for (auto& controller : app_window_controllers_) |
| 628 controller->AdditionalUserAddedToSession(profile); | 628 controller->AdditionalUserAddedToSession(profile); |
| (...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1499 LauncherItemController* controller = GetLauncherItemController(item.id); | 1499 LauncherItemController* controller = GetLauncherItemController(item.id); |
| 1500 if (!controller || controller->image_set_by_controller()) | 1500 if (!controller || controller->image_set_by_controller()) |
| 1501 continue; | 1501 continue; |
| 1502 item.image = image; | 1502 item.image = image; |
| 1503 if (arc_deferred_launcher_) | 1503 if (arc_deferred_launcher_) |
| 1504 arc_deferred_launcher_->MaybeApplySpinningEffect(id, &item.image); | 1504 arc_deferred_launcher_->MaybeApplySpinningEffect(id, &item.image); |
| 1505 model_->Set(index, item); | 1505 model_->Set(index, item); |
| 1506 // It's possible we're waiting on more than one item, so don't break. | 1506 // It's possible we're waiting on more than one item, so don't break. |
| 1507 } | 1507 } |
| 1508 } | 1508 } |
| OLD | NEW |