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

Unified Diff: ash/launcher/launcher_tooltip_manager.cc

Issue 11316323: Cleanup enums for shelf (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: style Created 8 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_tooltip_manager.h ('k') | ash/launcher/launcher_tooltip_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_tooltip_manager.cc
diff --git a/ash/launcher/launcher_tooltip_manager.cc b/ash/launcher/launcher_tooltip_manager.cc
index 4263bd6458084690f73b10aefa5cb35eb7d3af9c..14e3025b4445dea86fff882968721baaf8410e21 100644
--- a/ash/launcher/launcher_tooltip_manager.cc
+++ b/ash/launcher/launcher_tooltip_manager.cc
@@ -325,16 +325,16 @@ void LauncherTooltipManager::WillDeleteShelf() {
}
void LauncherTooltipManager::WillChangeVisibilityState(
- ShelfLayoutManager::VisibilityState new_state) {
- if (new_state == ShelfLayoutManager::HIDDEN) {
+ ShelfVisibilityState new_state) {
+ if (new_state == SHELF_HIDDEN) {
StopTimer();
Close();
}
}
void LauncherTooltipManager::OnAutoHideStateChanged(
- ShelfLayoutManager::AutoHideState new_state) {
- if (new_state == ShelfLayoutManager::AUTO_HIDE_HIDDEN) {
+ ShelfAutoHideState new_state) {
+ if (new_state == SHELF_AUTO_HIDE_HIDDEN) {
StopTimer();
// AutoHide state change happens during an event filter, so immediate close
// may cause a crash in the HandleMouseEvent() after the filter. So we just
« no previous file with comments | « ash/launcher/launcher_tooltip_manager.h ('k') | ash/launcher/launcher_tooltip_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698