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

Unified Diff: ash/shelf/shelf_button.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/shelf/shelf_button.h ('k') | ash/shelf/shelf_button_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « ash/shelf/shelf_button.h ('k') | ash/shelf/shelf_button_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698