summaryrefslogtreecommitdiffstats
path: root/ash/launcher/launcher_model.cc
diff options
context:
space:
mode:
authorflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-20 17:34:18 +0000
committerflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-20 17:34:18 +0000
commit97648ffce8ea8d9a3d2408e9c6d633a575ddfd76 (patch)
tree2928f95e4eb38d7989d22f51e1c104270be35f24 /ash/launcher/launcher_model.cc
parent5426114610074f80dab6c33a25accab67f4223a4 (diff)
downloadchromium_src-97648ffce8ea8d9a3d2408e9c6d633a575ddfd76.zip
chromium_src-97648ffce8ea8d9a3d2408e9c6d633a575ddfd76.tar.gz
chromium_src-97648ffce8ea8d9a3d2408e9c6d633a575ddfd76.tar.bz2
Revert 152221 - chromeos: Sync animation.
This was causing Linux ChromiumOS (dbg) browser_tests to fail with timeouts on several tests, identified with a local bisect. - Pulse app list button while LauncherModel has STATUS_LOADING; - Remove LauncherItemStatus::STATUS_IS_PENDING etc since it is no longer needed; - ChromeLauncherController sets LauncherModel::STATUS_LOADING on starting and watch for sync finish and pending extension install. It sets LauncherModel::STATUS_NORMAL when sync is finished and there is no pending extension install from sync, or when a maximum 60 seconds timeout since turning on loading status; BUG=129236 TEST=Verify sync animation after OOBE. Review URL: https://chromiumcodereview.appspot.com/10829268 TBR=xiyuan@chromium.org Review URL: https://chromiumcodereview.appspot.com/10827420 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher/launcher_model.cc')
-rw-r--r--ash/launcher/launcher_model.cc12
1 files changed, 2 insertions, 10 deletions
diff --git a/ash/launcher/launcher_model.cc b/ash/launcher/launcher_model.cc
index 2945a5d..d9aa8ad 100644
--- a/ash/launcher/launcher_model.cc
+++ b/ash/launcher/launcher_model.cc
@@ -7,6 +7,7 @@
#include <algorithm>
#include "ash/launcher/launcher_model_observer.h"
+#include "ui/aura/window.h"
namespace ash {
@@ -36,7 +37,7 @@ bool CompareByWeight(const LauncherItem& a, const LauncherItem& b) {
} // 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 @@ 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);
}