| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| index aaf46c231ed0cc96cf6bab858475091e00d6f4f5..15438c24ba2330ce908f0329107c41c557596ccd 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| @@ -1207,11 +1207,7 @@ void ChromeLauncherController::ShelfItemMoved(int start_index,
|
|
|
| void ChromeLauncherController::ShelfItemChanged(
|
| int index,
|
| - const ash::ShelfItem& old_item) {
|
| -}
|
| -
|
| -void ChromeLauncherController::ShelfStatusChanged() {
|
| -}
|
| + const ash::ShelfItem& old_item) {}
|
|
|
| void ChromeLauncherController::ActiveUserChanged(
|
| const std::string& user_email) {
|
| @@ -1339,9 +1335,9 @@ void ChromeLauncherController::OnIsSyncingChanged() {
|
|
|
| void ChromeLauncherController::OnAppSyncUIStatusChanged() {
|
| if (app_sync_ui_state_->status() == AppSyncUIState::STATUS_SYNCING)
|
| - model_->SetStatus(ash::ShelfModel::STATUS_LOADING);
|
| + model_->set_status(ash::ShelfModel::STATUS_LOADING);
|
| else
|
| - model_->SetStatus(ash::ShelfModel::STATUS_NORMAL);
|
| + model_->set_status(ash::ShelfModel::STATUS_NORMAL);
|
| }
|
|
|
| void ChromeLauncherController::ExtensionEnableFlowFinished() {
|
|
|