| Index: ash/launcher/launcher_model.cc
|
| diff --git a/ash/launcher/launcher_model.cc b/ash/launcher/launcher_model.cc
|
| index d9aa8adb3a618709f3763ca10b5ffb61b7be1ece..2945a5dc0bf0471927480aa27b365c02a8b75441 100644
|
| --- a/ash/launcher/launcher_model.cc
|
| +++ b/ash/launcher/launcher_model.cc
|
| @@ -7,7 +7,6 @@
|
| #include <algorithm>
|
|
|
| #include "ash/launcher/launcher_model_observer.h"
|
| -#include "ui/aura/window.h"
|
|
|
| namespace ash {
|
|
|
| @@ -37,7 +36,7 @@ bool CompareByWeight(const LauncherItem& a, const LauncherItem& b) {
|
|
|
| } // namespace
|
|
|
| -LauncherModel::LauncherModel() : next_id_(1) {
|
| +LauncherModel::LauncherModel() : next_id_(1), status_(STATUS_NORMAL) {
|
| LauncherItem app_list;
|
| app_list.type = TYPE_APP_LIST;
|
| app_list.is_incognito = false;
|
| @@ -118,6 +117,15 @@ LauncherItems::const_iterator LauncherModel::ItemByID(int id) const {
|
| return items_.end();
|
| }
|
|
|
| +void LauncherModel::SetStatus(Status status) {
|
| + if (status_ == status)
|
| + return;
|
| +
|
| + status_ = status;
|
| + FOR_EACH_OBSERVER(LauncherModelObserver, observers_,
|
| + LauncherStatusChanged());
|
| +}
|
| +
|
| void LauncherModel::AddObserver(LauncherModelObserver* observer) {
|
| observers_.AddObserver(observer);
|
| }
|
|
|