3 files changed, 9 insertions, 9 deletions
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc
index 661d04c..78d3475 100644
--- a/ash/tooltips/tooltip_controller.cc
+++ b/ash/tooltips/tooltip_controller.cc
@@ -121,7 +121,7 @@ views::Widget* CreateTooltip() {
 
 }  // namespace
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // Displays a widget with tooltip using a views::Label.
@@ -293,4 +293,4 @@ void TooltipController::UpdateIfRequired() {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/tooltips/tooltip_controller.h b/ash/tooltips/tooltip_controller.h
index 5ab55d64..2d1eb34 100644
--- a/ash/tooltips/tooltip_controller.h
+++ b/ash/tooltips/tooltip_controller.h
@@ -22,7 +22,7 @@ class TouchEvent;
 class Window;
 }
 
-namespace aura_shell {
+namespace ash {
 
 namespace test {
 class TooltipControllerTest;
@@ -53,7 +53,7 @@ class ASH_EXPORT TooltipController : public aura::client::TooltipClient,
   virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
 
  private:
-  friend class aura_shell::test::TooltipControllerTest;
+  friend class ash::test::TooltipControllerTest;
 
   class Tooltip;
 
@@ -75,6 +75,6 @@ class ASH_EXPORT TooltipController : public aura::client::TooltipClient,
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_TOOLTIPS_TOOLTIP_CONTROLLER_H_
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc
index 8ac5937..2392a85 100644
--- a/ash/tooltips/tooltip_controller_unittest.cc
+++ b/ash/tooltips/tooltip_controller_unittest.cc
@@ -12,7 +12,7 @@
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 namespace {
@@ -64,8 +64,8 @@ void AddViewToWidgetAndResize(views::Widget* widget, views::View* view) {
   widget->SetBounds(contents_view_bounds);
 }
 
-aura_shell::internal::TooltipController* GetController() {
-  return static_cast<aura_shell::internal::TooltipController*>(
+ash::internal::TooltipController* GetController() {
+  return static_cast<ash::internal::TooltipController*>(
       aura::client::GetTooltipClient());
 }
 
@@ -176,4 +176,4 @@ TEST_F(TooltipControllerTest, TooltipsInMultipleViews) {
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash