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

Unified Diff: ash/system/tray/tray_background_view.h

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/system/tray/throbber_view.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_background_view.h
diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h
index 4addcba51294e1f05e0b7945d73173ea9b856ad6..365e63a05d308f2275a88420718dda459f899254 100644
--- a/ash/system/tray/tray_background_view.h
+++ b/ash/system/tray/tray_background_view.h
@@ -12,8 +12,6 @@
#include "ui/views/bubble/tray_bubble_view.h"
namespace ash {
-namespace internal {
-
class ShelfLayoutManager;
class StatusAreaWidget;
class TrayEventFilter;
@@ -59,7 +57,7 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
DISALLOW_COPY_AND_ASSIGN(TrayContainer);
};
- explicit TrayBackgroundView(internal::StatusAreaWidget* status_area_widget);
+ explicit TrayBackgroundView(StatusAreaWidget* status_area_widget);
virtual ~TrayBackgroundView();
// Called after the tray has been added to the widget containing it.
@@ -73,11 +71,11 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
- // Overridden from internal::ActionableView.
+ // Overridden from ActionableView.
virtual bool PerformAction(const ui::Event& event) OVERRIDE;
virtual gfx::Rect GetFocusBounds() OVERRIDE;
- // Overridden from internal::BackgroundAnimatorDelegate.
+ // Overridden from BackgroundAnimatorDelegate.
virtual void UpdateBackground(int alpha) OVERRIDE;
// Called whenever the shelf alignment changes.
@@ -164,11 +162,11 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
ShelfAlignment shelf_alignment_;
// Owned by the view passed to SetContents().
- internal::TrayBackground* background_;
+ TrayBackground* background_;
// Animators for the background. They are only used for the old shelf layout.
- internal::BackgroundAnimator hide_background_animator_;
- internal::BackgroundAnimator hover_background_animator_;
+ BackgroundAnimator hide_background_animator_;
+ BackgroundAnimator hover_background_animator_;
// True if the background gets hovered.
bool hovered_;
@@ -183,7 +181,6 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
};
-} // namespace internal
} // namespace ash
#endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
« no previous file with comments | « ash/system/tray/throbber_view.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698