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

13 files changed, 44 insertions, 73 deletions

diff --git a/ash/test/app_list_controller_test_api.h b/ash/test/app_list_controller_test_api.h
index 4064a77..733264b 100644
--- a/ash/test/app_list_controller_test_api.h
+++ b/ash/test/app_list_controller_test_api.h
@@ -13,10 +13,8 @@ class AppsGridView;
 }
 
 namespace ash {
-class Shell;
-namespace internal {
 class AppListController;
-}
+class Shell;
 
 namespace test {
 
@@ -31,7 +29,7 @@ class AppListControllerTestApi {
   app_list::AppListView* view();
 
  private:
-  internal::AppListController* app_list_controller_;  // Not owned.
+  AppListController* app_list_controller_;  // Not owned.
 
   DISALLOW_COPY_AND_ASSIGN(AppListControllerTestApi);
 };
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index c7bdbbb..193e71a 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -31,9 +31,7 @@ class EventGenerator;
 }  // namespace aura
 
 namespace ash {
-namespace internal {
 class DisplayManager;
-}  // namespace internal
 
 namespace test {
 
diff --git a/ash/test/display_manager_test_api.cc b/ash/test/display_manager_test_api.cc
index 794916b..b7c6f40 100644
--- a/ash/test/display_manager_test_api.cc
+++ b/ash/test/display_manager_test_api.cc
@@ -16,14 +16,14 @@
 namespace ash {
 namespace test {
 typedef std::vector<gfx::Display> DisplayList;
-typedef internal::DisplayInfo DisplayInfo;
+typedef DisplayInfo DisplayInfo;
 typedef std::vector<DisplayInfo> DisplayInfoList;
 
 namespace {
 
 std::vector<DisplayInfo> CreateDisplayInfoListFromString(
     const std::string specs,
-    internal::DisplayManager* display_manager) {
+    DisplayManager* display_manager) {
   std::vector<DisplayInfo> display_info_list;
   std::vector<std::string> parts;
   base::SplitString(specs, ',', &parts);
@@ -41,10 +41,8 @@ std::vector<DisplayInfo> CreateDisplayInfoListFromString(
 
 }  // namespace
 
-DisplayManagerTestApi::DisplayManagerTestApi(
-    internal::DisplayManager* display_manager)
-        : display_manager_(display_manager) {
-}
+DisplayManagerTestApi::DisplayManagerTestApi(DisplayManager* display_manager)
+    : display_manager_(display_manager) {}
 
 DisplayManagerTestApi::~DisplayManagerTestApi() {}
 
diff --git a/ash/test/display_manager_test_api.h b/ash/test/display_manager_test_api.h
index db47ab3..6c5d565 100644
--- a/ash/test/display_manager_test_api.h
+++ b/ash/test/display_manager_test_api.h
@@ -12,15 +12,13 @@
 #include "ui/display/display_constants.h"
 
 namespace ash {
-namespace internal {
 class DisplayManager;
-}  // internal
 
 namespace test {
 
 class DisplayManagerTestApi {
  public:
-  explicit DisplayManagerTestApi(internal::DisplayManager* display_manager);
+  explicit DisplayManagerTestApi(DisplayManager* display_manager);
   virtual ~DisplayManagerTestApi();
 
   // Update the display configuration as given in |display_specs|. The format of
@@ -42,7 +40,7 @@ class DisplayManagerTestApi {
       const std::vector<ui::ColorCalibrationProfile>& profiles);
 
  private:
-  internal::DisplayManager* display_manager_;  // not owned
+  DisplayManager* display_manager_;  // not owned
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManagerTestApi);
 };
diff --git a/ash/test/overflow_bubble_view_test_api.cc b/ash/test/overflow_bubble_view_test_api.cc
index cfbfc73..59a1096 100644
--- a/ash/test/overflow_bubble_view_test_api.cc
+++ b/ash/test/overflow_bubble_view_test_api.cc
@@ -10,9 +10,8 @@ namespace ash {
 namespace test {
 
 OverflowBubbleViewTestAPI::OverflowBubbleViewTestAPI(
-    internal::OverflowBubbleView* bubble_view)
-    : bubble_view_(bubble_view) {
-}
+    OverflowBubbleView* bubble_view)
+    : bubble_view_(bubble_view) {}
 
 OverflowBubbleViewTestAPI::~OverflowBubbleViewTestAPI() {
 }
diff --git a/ash/test/overflow_bubble_view_test_api.h b/ash/test/overflow_bubble_view_test_api.h
index b789b73..2bd5f27 100644
--- a/ash/test/overflow_bubble_view_test_api.h
+++ b/ash/test/overflow_bubble_view_test_api.h
@@ -12,16 +12,13 @@ class Size;
 }
 
 namespace ash {
-
-namespace internal {
 class OverflowBubbleView;
-}
 
 namespace test {
 
 class OverflowBubbleViewTestAPI {
  public:
-  explicit OverflowBubbleViewTestAPI(internal::OverflowBubbleView* bubble_view);
+  explicit OverflowBubbleViewTestAPI(OverflowBubbleView* bubble_view);
   ~OverflowBubbleViewTestAPI();
 
   // Returns the total width of items included in ShelfView.
@@ -32,7 +29,7 @@ class OverflowBubbleViewTestAPI {
   void ScrollByXOffset(int x_offset);
 
  private:
-  internal::OverflowBubbleView* bubble_view_;
+  OverflowBubbleView* bubble_view_;
 
   DISALLOW_COPY_AND_ASSIGN(OverflowBubbleViewTestAPI);
 };
diff --git a/ash/test/shelf_test_api.cc b/ash/test/shelf_test_api.cc
index 0ce27f7..d050f73 100644
--- a/ash/test/shelf_test_api.cc
+++ b/ash/test/shelf_test_api.cc
@@ -16,9 +16,7 @@ ShelfTestAPI::ShelfTestAPI(Shelf* shelf)
 ShelfTestAPI::~ShelfTestAPI() {
 }
 
-internal::ShelfView* ShelfTestAPI::shelf_view() {
-  return shelf_->shelf_view_;
-}
+ShelfView* ShelfTestAPI::shelf_view() { return shelf_->shelf_view_; }
 
 void ShelfTestAPI::SetShelfDelegate(ShelfDelegate* delegate) {
   shelf_->delegate_ = delegate;
diff --git a/ash/test/shelf_test_api.h b/ash/test/shelf_test_api.h
index 48aafda..7c353ab 100644
--- a/ash/test/shelf_test_api.h
+++ b/ash/test/shelf_test_api.h
@@ -11,10 +11,7 @@ namespace ash {
 
 class Shelf;
 class ShelfDelegate;
-
-namespace internal {
 class ShelfView;
-}
 
 namespace test {
 
@@ -26,7 +23,7 @@ class ShelfTestAPI {
   ~ShelfTestAPI();
 
   // An accessor for |shelf_view|.
-  internal::ShelfView* shelf_view();
+  ShelfView* shelf_view();
 
   // Set ShelfDelegate.
   void SetShelfDelegate(ShelfDelegate* delegate);
diff --git a/ash/test/shelf_view_test_api.cc b/ash/test/shelf_view_test_api.cc
index 2147ada..d3d545c 100644
--- a/ash/test/shelf_view_test_api.cc
+++ b/ash/test/shelf_view_test_api.cc
@@ -36,9 +36,8 @@ class TestAPIAnimationObserver : public views::BoundsAnimatorObserver {
 namespace ash {
 namespace test {
 
-ShelfViewTestAPI::ShelfViewTestAPI(internal::ShelfView* shelf_view)
-    : shelf_view_(shelf_view) {
-}
+ShelfViewTestAPI::ShelfViewTestAPI(ShelfView* shelf_view)
+    : shelf_view_(shelf_view) {}
 
 ShelfViewTestAPI::~ShelfViewTestAPI() {
 }
@@ -47,13 +46,12 @@ int ShelfViewTestAPI::GetButtonCount() {
   return shelf_view_->view_model_->view_size();
 }
 
-internal::ShelfButton* ShelfViewTestAPI::GetButton(int index) {
+ShelfButton* ShelfViewTestAPI::GetButton(int index) {
   // App list button is not a ShelfButton.
   if (shelf_view_->model_->items()[index].type == ash::TYPE_APP_LIST)
     return NULL;
 
-  return static_cast<internal::ShelfButton*>(
-      shelf_view_->view_model_->view_at(index));
+  return static_cast<ShelfButton*>(shelf_view_->view_model_->view_at(index));
 }
 
 int ShelfViewTestAPI::GetFirstVisibleIndex() {
@@ -99,7 +97,7 @@ void ShelfViewTestAPI::RunMessageLoopUntilAnimationsDone() {
   shelf_view_->bounds_animator_->RemoveObserver(observer.get());
 }
 
-internal::OverflowBubble* ShelfViewTestAPI::overflow_bubble() {
+OverflowBubble* ShelfViewTestAPI::overflow_bubble() {
   return shelf_view_->overflow_bubble_.get();
 }
 
diff --git a/ash/test/shelf_view_test_api.h b/ash/test/shelf_view_test_api.h
index cff21f4..71853fd 100644
--- a/ash/test/shelf_view_test_api.h
+++ b/ash/test/shelf_view_test_api.h
@@ -14,28 +14,24 @@ class Size;
 }
 
 namespace ash {
-
-class ShelfDelegate;
-
-namespace internal {
 class OverflowBubble;
 class ShelfButton;
+class ShelfDelegate;
 class ShelfView;
-}
 
 namespace test {
 
 // Use the api in this class to test ShelfView.
 class ShelfViewTestAPI {
  public:
-  explicit ShelfViewTestAPI(internal::ShelfView* shelf_view);
+  explicit ShelfViewTestAPI(ShelfView* shelf_view);
   ~ShelfViewTestAPI();
 
   // Number of icons displayed.
   int GetButtonCount();
 
   // Retrieve the button at |index|.
-  internal::ShelfButton* GetButton(int index);
+  ShelfButton* GetButton(int index);
 
   // First visible button index.
   int GetFirstVisibleIndex();
@@ -60,10 +56,10 @@ class ShelfViewTestAPI {
   void RunMessageLoopUntilAnimationsDone();
 
   // An accessor for |shelf_view|.
-  internal::ShelfView* shelf_view() { return shelf_view_; }
+  ShelfView* shelf_view() { return shelf_view_; }
 
   // An accessor for overflow bubble.
-  internal::OverflowBubble* overflow_bubble();
+  OverflowBubble* overflow_bubble();
 
   // Returns the preferred size of |shelf_view_|.
   gfx::Size GetPreferredSize();
@@ -90,7 +86,7 @@ class ShelfViewTestAPI {
   bool DraggedItemFromOverflowToShelf();
 
  private:
-  internal::ShelfView* shelf_view_;
+  ShelfView* shelf_view_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfViewTestAPI);
 };
diff --git a/ash/test/shell_test_api.cc b/ash/test/shell_test_api.cc
index b343f60..b8c3e2d 100644
--- a/ash/test/shell_test_api.cc
+++ b/ash/test/shell_test_api.cc
@@ -18,7 +18,7 @@ namespace test {
 
 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {}
 
-internal::RootWindowLayoutManager* ShellTestApi::root_window_layout() {
+RootWindowLayoutManager* ShellTestApi::root_window_layout() {
   return shell_->GetPrimaryRootWindowController()->root_window_layout();
 }
 
@@ -27,17 +27,15 @@ ShellTestApi::input_method_event_filter() {
   return shell_->input_method_filter_.get();
 }
 
-internal::SystemGestureEventFilter*
-ShellTestApi::system_gesture_event_filter() {
+SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() {
   return shell_->system_gesture_filter_.get();
 }
 
-internal::WorkspaceController* ShellTestApi::workspace_controller() {
+WorkspaceController* ShellTestApi::workspace_controller() {
   return shell_->GetPrimaryRootWindowController()->workspace_controller();
 }
 
-internal::ScreenPositionController*
-ShellTestApi::screen_position_controller() {
+ScreenPositionController* ShellTestApi::screen_position_controller() {
   return shell_->screen_position_controller_.get();
 }
 
@@ -49,16 +47,15 @@ ShelfModel* ShellTestApi::shelf_model() {
   return shell_->shelf_model_.get();
 }
 
-internal::DragDropController* ShellTestApi::drag_drop_controller() {
+DragDropController* ShellTestApi::drag_drop_controller() {
   return shell_->drag_drop_controller_.get();
 }
 
-internal::AppListController* ShellTestApi::app_list_controller() {
+AppListController* ShellTestApi::app_list_controller() {
   return shell_->app_list_controller_.get();
 }
 
-internal::MaximizeModeWindowManager*
-ShellTestApi::maximize_mode_window_manager() {
+MaximizeModeWindowManager* ShellTestApi::maximize_mode_window_manager() {
   return shell_->maximize_mode_window_manager_.get();
 }
 
diff --git a/ash/test/shell_test_api.h b/ash/test/shell_test_api.h
index 12e40b7..68c3749 100644
--- a/ash/test/shell_test_api.h
+++ b/ash/test/shell_test_api.h
@@ -12,20 +12,17 @@ class InputMethodEventFilter;
 }  // namespace wm
 
 namespace ash {
-class AshNativeCursorManager;
-class ShelfDelegate;
-class ShelfModel;
-class Shell;
-
-namespace internal {
 class AppListController;
+class AshNativeCursorManager;
 class DragDropController;
 class MaximizeModeWindowManager;
 class RootWindowLayoutManager;
 class ScreenPositionController;
+class ShelfDelegate;
+class ShelfModel;
+class Shell;
 class SystemGestureEventFilter;
 class WorkspaceController;
-}  // namespace internal
 
 namespace test {
 
@@ -34,16 +31,16 @@ class ShellTestApi {
 public:
   explicit ShellTestApi(Shell* shell);
 
-  internal::RootWindowLayoutManager* root_window_layout();
+  RootWindowLayoutManager* root_window_layout();
   ::wm::InputMethodEventFilter* input_method_event_filter();
-  internal::SystemGestureEventFilter* system_gesture_event_filter();
-  internal::WorkspaceController* workspace_controller();
-  internal::ScreenPositionController* screen_position_controller();
+  SystemGestureEventFilter* system_gesture_event_filter();
+  WorkspaceController* workspace_controller();
+  ScreenPositionController* screen_position_controller();
   AshNativeCursorManager* ash_native_cursor_manager();
   ShelfModel* shelf_model();
-  internal::DragDropController* drag_drop_controller();
-  internal::AppListController* app_list_controller();
-  internal::MaximizeModeWindowManager* maximize_mode_window_manager();
+  DragDropController* drag_drop_controller();
+  AppListController* app_list_controller();
+  MaximizeModeWindowManager* maximize_mode_window_manager();
   void DisableOutputConfiguratorAnimation();
 
   // Set ShelfDelegate.
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index fe981d7..65545e7 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -120,7 +120,7 @@ SessionStateDelegate* TestShellDelegate::CreateSessionStateDelegate() {
 }
 
 AccessibilityDelegate* TestShellDelegate::CreateAccessibilityDelegate() {
-  return new internal::DefaultAccessibilityDelegate();
+  return new DefaultAccessibilityDelegate();
 }
 
 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() {