Index: ash/shelf/shelf_button.cc |
diff --git a/ash/shelf/shelf_button.cc b/ash/shelf/shelf_button.cc |
index ebd81106fce173e47b6ed20a1b7fc245897d5866..7a740a667f8957632e64b428b7ebf2b4670356dc 100644 |
--- a/ash/shelf/shelf_button.cc |
+++ b/ash/shelf/shelf_button.cc |
@@ -40,9 +40,9 @@ const int kHopDownMS = 200; |
const int kAttentionThrobDurationMS = 800; |
bool ShouldHop(int state) { |
- return state & ash::internal::ShelfButton::STATE_HOVERED || |
- state & ash::internal::ShelfButton::STATE_ACTIVE || |
- state & ash::internal::ShelfButton::STATE_FOCUSED; |
+ return state & ash::ShelfButton::STATE_HOVERED || |
+ state & ash::ShelfButton::STATE_ACTIVE || |
+ state & ash::ShelfButton::STATE_FOCUSED; |
} |
// Simple AnimationDelegate that owns a single ThrobAnimation instance to |
@@ -116,7 +116,6 @@ class ShelfButtonAnimation : public gfx::AnimationDelegate { |
} // namespace |
namespace ash { |
-namespace internal { |
//////////////////////////////////////////////////////////////////////////////// |
// ShelfButton::BarView |
@@ -590,5 +589,4 @@ void ShelfButton::UpdateBar() { |
bar_->SetVisible(bar_id != 0 && state_ != STATE_NORMAL); |
} |
-} // namespace internal |
} // namespace ash |