| Index: ash/launcher/launcher_model.cc
|
| ===================================================================
|
| --- ash/launcher/launcher_model.cc (revision 152351)
|
| +++ ash/launcher/launcher_model.cc (working copy)
|
| @@ -7,6 +7,7 @@
|
| #include <algorithm>
|
|
|
| #include "ash/launcher/launcher_model_observer.h"
|
| +#include "ui/aura/window.h"
|
|
|
| namespace ash {
|
|
|
| @@ -36,7 +37,7 @@
|
|
|
| } // namespace
|
|
|
| -LauncherModel::LauncherModel() : next_id_(1), status_(STATUS_NORMAL) {
|
| +LauncherModel::LauncherModel() : next_id_(1) {
|
| LauncherItem app_list;
|
| app_list.type = TYPE_APP_LIST;
|
| app_list.is_incognito = false;
|
| @@ -117,15 +118,6 @@
|
| 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);
|
| }
|
|
|