Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Unified Diff: ash/launcher/launcher_model.cc

Issue 10827420: Revert 152221 - chromeos: Sync animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/launcher/launcher_model.h ('k') | ash/launcher/launcher_model_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « ash/launcher/launcher_model.h ('k') | ash/launcher/launcher_model_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698