Eliminate ash::internal namespace

Plus obvious style nit fixes.

BUG=None
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/224113005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261522 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 16 insertions, 39 deletions

diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
index adff775..e8ea56e 100644
--- a/ash/system/user/tray_user.cc
+++ b/ash/system/user/tray_user.cc
@@ -134,8 +134,6 @@ void SwitchUser(ash::MultiProfileIndex user_index) {
 }  // namespace
 
 namespace ash {
-namespace internal {
-
 namespace tray {
 
 // A custom image view with rounded edges.
@@ -1356,14 +1354,12 @@ MultiProfileIndex TrayUser::GetTrayIndex() {
 }
 
 void TrayUser::UpdateLayoutOfItem() {
-  internal::RootWindowController* controller =
-      internal::GetRootWindowController(
-          system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow());
+  RootWindowController* controller = GetRootWindowController(
+      system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow());
   if (controller && controller->shelf()) {
     UpdateAfterShelfAlignmentChange(
         controller->GetShelfLayoutManager()->GetAlignment());
   }
 }
 
-}  // namespace internal
 }  // namespace ash
diff --git a/ash/system/user/tray_user.h b/ash/system/user/tray_user.h
index 6ccad97..d956c31 100644
--- a/ash/system/user/tray_user.h
+++ b/ash/system/user/tray_user.h
@@ -22,8 +22,6 @@ class Label;
 }
 
 namespace ash {
-namespace internal {
-
 namespace tray {
 class UserView;
 class RoundedImageView;
@@ -97,7 +95,6 @@ class ASH_EXPORT TrayUser : public SystemTrayItem,
   DISALLOW_COPY_AND_ASSIGN(TrayUser);
 };
 
-}  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_USER_TRAY_USER_H_
diff --git a/ash/system/user/tray_user_separator.cc b/ash/system/user/tray_user_separator.cc
index dc63bff..dd60f6b 100644
--- a/ash/system/user/tray_user_separator.cc
+++ b/ash/system/user/tray_user_separator.cc
@@ -9,7 +9,6 @@
 #include "ui/views/view.h"
 
 namespace ash {
-namespace internal {
 
 TrayUserSeparator::TrayUserSeparator(SystemTray* system_tray)
     : SystemTrayItem(system_tray),
@@ -44,5 +43,4 @@ void TrayUserSeparator::DestroyDefaultView() {
   separator_shown_ = false;
 }
 
-}  // namespace internal
 }  // namespace ash
diff --git a/ash/system/user/tray_user_separator.h b/ash/system/user/tray_user_separator.h
index 62e5209..003e4cd 100644
--- a/ash/system/user/tray_user_separator.h
+++ b/ash/system/user/tray_user_separator.h
@@ -9,7 +9,6 @@
 #include "ash/system/tray/system_tray_item.h"
 
 namespace ash {
-namespace internal {
 
 // This tray item is showing an additional separator line between the logged in
 // users and the rest of the system tray menu. The separator will only be shown
@@ -41,7 +40,6 @@ class ASH_EXPORT TrayUserSeparator : public SystemTrayItem {
   DISALLOW_COPY_AND_ASSIGN(TrayUserSeparator);
 };
 
-}  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_USER_TRAY_USER_SEPARATOR_H_
diff --git a/ash/system/user/tray_user_unittest.cc b/ash/system/user/tray_user_unittest.cc
index 96f7fa6..b0d77c4 100644
--- a/ash/system/user/tray_user_unittest.cc
+++ b/ash/system/user/tray_user_unittest.cc
@@ -23,7 +23,6 @@
 #include "ui/views/widget/widget.h"
 
 namespace ash {
-namespace internal {
 
 class TrayUserTest : public ash::test::AshTestBase {
  public:
@@ -48,10 +47,8 @@ class TrayUserTest : public ash::test::AshTestBase {
   ShelfLayoutManager* shelf() { return shelf_; }
   SystemTray* tray() { return tray_; }
   ash::test::TestSessionStateDelegate* delegate() { return delegate_; }
-  ash::internal::TrayUser* tray_user(int index) { return tray_user_[index]; }
-  ash::internal::TrayUserSeparator* tray_user_separator() {
-    return tray_user_separator_;
-  }
+  ash::TrayUser* tray_user(int index) { return tray_user_[index]; }
+  ash::TrayUserSeparator* tray_user_separator() { return tray_user_separator_; }
 
  private:
   ShelfLayoutManager* shelf_;
@@ -59,7 +56,7 @@ class TrayUserTest : public ash::test::AshTestBase {
   ash::test::TestSessionStateDelegate* delegate_;
 
   // Note that the ownership of these items is on the shelf.
-  std::vector<ash::internal::TrayUser*> tray_user_;
+  std::vector<ash::TrayUser*> tray_user_;
 
   // The separator between the tray users and the rest of the menu.
   // Note: The item will get owned by the shelf.
@@ -100,11 +97,11 @@ void TrayUserTest::InitializeParameters(int users_logged_in,
   // Instead of using the existing tray panels we create new ones which makes
   // the access easier.
   for (int i = 0; i < delegate_->GetMaximumNumberOfLoggedInUsers(); i++) {
-    tray_user_.push_back(new ash::internal::TrayUser(tray_, i));
+    tray_user_.push_back(new ash::TrayUser(tray_, i));
     tray_->AddTrayItem(tray_user_[i]);
   }
   // We then add also the separator.
-  tray_user_separator_ = new ash::internal::TrayUserSeparator(tray_);
+  tray_user_separator_ = new ash::TrayUserSeparator(tray_);
   tray_->AddTrayItem(tray_user_separator_);
 }
 
@@ -152,8 +149,7 @@ TEST_F(TrayUserTest, SingleUserModeDoesNotAllowAddingUser) {
   EXPECT_FALSE(tray()->IsAnyBubbleVisible());
 
   for (int i = 0; i < delegate()->GetMaximumNumberOfLoggedInUsers(); i++)
-    EXPECT_EQ(ash::internal::TrayUser::HIDDEN,
-              tray_user(i)->GetStateForTest());
+    EXPECT_EQ(ash::TrayUser::HIDDEN, tray_user(i)->GetStateForTest());
   EXPECT_FALSE(tray_user_separator()->separator_shown());
 
   ShowTrayMenu(&generator);
@@ -162,8 +158,7 @@ TEST_F(TrayUserTest, SingleUserModeDoesNotAllowAddingUser) {
   EXPECT_TRUE(tray()->IsAnyBubbleVisible());
 
   for (int i = 0; i < delegate()->GetMaximumNumberOfLoggedInUsers(); i++)
-    EXPECT_EQ(i == 0 ? ash::internal::TrayUser::SHOWN :
-                       ash::internal::TrayUser::HIDDEN,
+    EXPECT_EQ(i == 0 ? ash::TrayUser::SHOWN : ash::TrayUser::HIDDEN,
               tray_user(i)->GetStateForTest());
   EXPECT_FALSE(tray_user_separator()->separator_shown());
   tray()->CloseSystemBubble();
@@ -200,8 +195,7 @@ TEST_F(TrayUserTest, MutiUserModeDoesNotAllowToAddUser) {
     EXPECT_TRUE(tray()->HasSystemBubble());
     EXPECT_TRUE(tray()->IsAnyBubbleVisible());
     for (int i = 0; i < max_users; i++) {
-      EXPECT_EQ(i < j ? ash::internal::TrayUser::SHOWN :
-                        ash::internal::TrayUser::HIDDEN,
+      EXPECT_EQ(i < j ? ash::TrayUser::SHOWN : ash::TrayUser::HIDDEN,
                 tray_user(i)->GetStateForTest());
     }
 
@@ -210,33 +204,28 @@ TEST_F(TrayUserTest, MutiUserModeDoesNotAllowToAddUser) {
 
     // Move the mouse over the user item and it should hover.
     MoveOverUserItem(&generator, 0);
-    EXPECT_EQ(ash::internal::TrayUser::HOVERED,
-              tray_user(0)->GetStateForTest());
+    EXPECT_EQ(ash::TrayUser::HOVERED, tray_user(0)->GetStateForTest());
     for (int i = 1; i < max_users; i++) {
-      EXPECT_EQ(i < j ? ash::internal::TrayUser::SHOWN :
-                        ash::internal::TrayUser::HIDDEN,
+      EXPECT_EQ(i < j ? ash::TrayUser::SHOWN : ash::TrayUser::HIDDEN,
                 tray_user(i)->GetStateForTest());
     }
 
     // Check that clicking the button allows to add item if we have still room
     // for one more user.
     ClickUserItem(&generator, 0);
-    EXPECT_EQ(j == max_users ?
-                  ash::internal::TrayUser::ACTIVE_BUT_DISABLED :
-                  ash::internal::TrayUser::ACTIVE,
+    EXPECT_EQ(j == max_users ? ash::TrayUser::ACTIVE_BUT_DISABLED
+                             : ash::TrayUser::ACTIVE,
               tray_user(0)->GetStateForTest());
 
     // Click the button again to see that the menu goes away.
     ClickUserItem(&generator, 0);
-    EXPECT_EQ(ash::internal::TrayUser::HOVERED,
-              tray_user(0)->GetStateForTest());
+    EXPECT_EQ(ash::TrayUser::HOVERED, tray_user(0)->GetStateForTest());
 
     // Close and check that everything is deleted.
     tray()->CloseSystemBubble();
     EXPECT_FALSE(tray()->IsAnyBubbleVisible());
     for (int i = 0; i < delegate()->GetMaximumNumberOfLoggedInUsers(); i++)
-      EXPECT_EQ(ash::internal::TrayUser::HIDDEN,
-                tray_user(i)->GetStateForTest());
+      EXPECT_EQ(ash::TrayUser::HIDDEN, tray_user(i)->GetStateForTest());
   }
 }
 
@@ -258,5 +247,4 @@ TEST_F(TrayUserTest, MutiUserModeButtonClicks) {
 
 #endif
 
-}  // namespace internal
 }  // namespace ash