summaryrefslogtreecommitdiffstats
path: root/ash/launcher/launcher_model_unittest.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_unittest.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_unittest.cc')
-rw-r--r--ash/launcher/launcher_model_unittest.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/ash/launcher/launcher_model_unittest.cc b/ash/launcher/launcher_model_unittest.cc
index 9a4fbcd..cc449eba 100644
--- a/ash/launcher/launcher_model_unittest.cc
+++ b/ash/launcher/launcher_model_unittest.cc
@@ -4,9 +4,6 @@
#include "ash/launcher/launcher_model.h"
-#include <set>
-#include <string>
-
#include "ash/launcher/launcher_model_observer.h"
#include "base/stringprintf.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -51,8 +48,6 @@ class TestLauncherModelObserver : public LauncherModelObserver {
virtual void LauncherItemMoved(int start_index, int target_index) OVERRIDE {
moved_count_++;
}
- virtual void LauncherStatusChanged() OVERRIDE {
- }
private:
void AddToResult(const std::string& format, int count, std::string* result) {