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

Unified Diff: ash/launcher/launcher_types.cc

Issue 97983003: Start the move of launcher_types.h to shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: the rename Created 7 years 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_types.h ('k') | ash/shelf/app_list_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_types.cc
diff --git a/ash/launcher/launcher_types.cc b/ash/launcher/launcher_types.cc
index 67dc5729c94776db6cabd33404169da1649aef60..ecdf3266e6c296685c16ffebea40fe21981eba7b 100644
--- a/ash/launcher/launcher_types.cc
+++ b/ash/launcher/launcher_types.cc
@@ -4,17 +4,13 @@
#include "ash/launcher/launcher_types.h"
-namespace ash {
+#include "ash/shelf/shelf_constants.h"
-const int kLauncherPreferredSize = 48;
-const int kLauncherBackgroundAlpha = 204;
-const int kInvalidImageResourceID = -1;
-const int kInvalidLauncherID = 0;
-const int kTimeToSwitchBackgroundMs = 1000;
+namespace ash {
LauncherItem::LauncherItem()
: type(TYPE_UNDEFINED),
- id(kInvalidLauncherID),
+ id(kInvalidShelfID),
status(STATUS_CLOSED) {
}
« no previous file with comments | « ash/launcher/launcher_types.h ('k') | ash/shelf/app_list_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698