Eliminate ash::internal namespace

ash/shelf/shelf_view.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SHELF_SHELF_VIEW_H_
 #define ASH_SHELF_SHELF_VIEW_H_
 
 #include <utility>
 #include <vector>
 
 #include "ash/shelf/shelf_button_host.h"
 #include "ash/shelf/shelf_model_observer.h"
 #include "ash/wm/gestures/shelf_gesture_handler.h"
 #include "base/observer_list.h"
 #include "ui/app_list/views/app_list_drag_and_drop_host.h"
 #include "ui/views/animation/bounds_animator_observer.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/view.h"
 
 namespace views {
 class BoundsAnimator;
 class MenuModelAdapter;
 class MenuRunner;
 class ViewModel;
 }
 
 namespace ash {
-
-namespace test {
-class ShelfViewTestAPI;
-}
-
 class ShelfDelegate;
 class ShelfIconObserver;
 class ShelfItemDelegateManager;
 class ShelfModel;
 struct ShelfItem;
-
-namespace internal {
-
 class DragImageView;
 class OverflowBubble;
 class OverflowButton;
 class ShelfButton;
 class ShelfLayoutManager;
 class ShelfTooltipManager;
 
+namespace test {
+class ShelfViewTestAPI;
+}
+
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_BOTTOM;
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_LEFT;
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_RIGHT;
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_COUNT;
 
 class ASH_EXPORT ShelfView : public views::View,
                              public ShelfModelObserver,
                              public views::ButtonListener,
                              public ShelfButtonHost,
                              public views::ContextMenuController,
@@ skipping 353 matching lines @@
   ShelfID drag_and_drop_shelf_id_;
 
   // The application ID of the application which we drag and drop.
   std::string drag_and_drop_app_id_;
 
   // The original launcher item's size before the dragging operation.
   gfx::Size pre_drag_and_drop_size_;
 
   // The image proxy for drag operations when a drag and drop host exists and
   // the item can be dragged outside the app grid.
-  scoped_ptr<ash::internal::DragImageView> drag_image_;
+  scoped_ptr<ash::DragImageView> drag_image_;
 
   // The cursor offset to the middle of the dragged item.
   gfx::Vector2d drag_image_offset_;
 
   // The view which gets replaced by our drag icon proxy.
   views::View* drag_replaced_view_;
 
   // True when the icon was dragged off the shelf.
   bool dragged_off_shelf_;
 
@@ skipping 11 matching lines @@
 
   // Holds a pointer to main ShelfView when a ShelfView is in overflow mode.
   ShelfView* main_shelf_;
 
   // True when ripped item from overflow bubble is entered into Shelf.
   bool dragged_off_from_overflow_to_shelf_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfView);
 };
 
-}  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_VIEW_H_