Eliminate ash::internal namespace

ash/shelf/shelf.cc

 // Copyright 2013 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.
 
 #include "ash/shelf/shelf.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/focus_cycler.h"
@@ skipping 31 matching lines @@
 
 const char Shelf::kNativeViewName[] = "ShelfView";
 
 Shelf::Shelf(ShelfModel* shelf_model,
              ShelfDelegate* shelf_delegate,
              ShelfWidget* shelf_widget)
     : shelf_view_(NULL),
       alignment_(shelf_widget->GetAlignment()),
       delegate_(shelf_delegate),
       shelf_widget_(shelf_widget) {
-  shelf_view_ = new internal::ShelfView(
+  shelf_view_ = new ShelfView(
       shelf_model, delegate_, shelf_widget_->shelf_layout_manager());
   shelf_view_->Init();
   shelf_widget_->GetContentsView()->AddChildView(shelf_view_);
   shelf_widget_->GetNativeView()->SetName(kNativeViewName);
   delegate_->OnShelfCreated(this);
 }
 
 Shelf::~Shelf() {
   delegate_->OnShelfDestroyed(this);
 }
 
 // static
 Shelf* Shelf::ForPrimaryDisplay() {
-  ShelfWidget* shelf_widget = internal::RootWindowController::ForShelf(
-      Shell::GetPrimaryRootWindow())->shelf();
+  ShelfWidget* shelf_widget =
+      RootWindowController::ForShelf(Shell::GetPrimaryRootWindow())->shelf();
   return shelf_widget ? shelf_widget->shelf() : NULL;
 }
 
 // static
 Shelf* Shelf::ForWindow(aura::Window* window) {
-  ShelfWidget* shelf_widget =
-      internal::RootWindowController::ForShelf(window)->shelf();
+  ShelfWidget* shelf_widget = RootWindowController::ForShelf(window)->shelf();
   return shelf_widget ? shelf_widget->shelf() : NULL;
 }
 
 void Shelf::SetAlignment(ShelfAlignment alignment) {
   alignment_ = alignment;
   shelf_view_->OnShelfAlignmentChanged();
   // ShelfLayoutManager will resize the shelf.
 }
 
 gfx::Rect Shelf::GetScreenBoundsOfItemIconForWindow(aura::Window* window) {
@@ skipping 104 matching lines @@
 
 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const {
   return shelf_view_->GetVisibleItemsBoundsInScreen();
 }
 
 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {
   return shelf_view_;
 }
 
 }  // namespace ash