Eliminate ash::internal namespace

ash/wm/panels/panel_window_resizer.cc

 // 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.
 
 #include "ash/wm/panels/panel_window_resizer.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_types.h"
@@ skipping 14 matching lines @@
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
 const int kPanelSnapToLauncherDistance = 30;
 
-internal::PanelLayoutManager* GetPanelLayoutManager(
-    aura::Window* panel_container) {
-  DCHECK(panel_container->id() == internal::kShellWindowId_PanelContainer);
-  return static_cast<internal::PanelLayoutManager*>(
-      panel_container->layout_manager());
+PanelLayoutManager* GetPanelLayoutManager(aura::Window* panel_container) {
+  DCHECK(panel_container->id() == kShellWindowId_PanelContainer);
+  return static_cast<PanelLayoutManager*>(panel_container->layout_manager());
 }
 
 }  // namespace
 
 PanelWindowResizer::~PanelWindowResizer() {
 }
 
 // static
 PanelWindowResizer*
 PanelWindowResizer::Create(WindowResizer* next_window_resizer,
@@ skipping 17 matching lines @@
       screen->GetDisplayNearestWindow(panel_container_->GetRootWindow()).id()) {
     // The panel is being dragged to a new display. If the previous container is
     // the current parent of the panel it will be informed of the end of drag
     // when the panel is reparented, otherwise let the previous container know
     // the drag is complete. If we told the panel's parent that the drag was
     // complete it would begin positioning the panel.
     if (GetTarget()->parent() != panel_container_)
       GetPanelLayoutManager(panel_container_)->FinishDragging();
     aura::Window* dst_root = Shell::GetInstance()->display_controller()->
         GetRootWindowForDisplayId(dst_display.id());
-    panel_container_ = Shell::GetContainer(
-        dst_root, internal::kShellWindowId_PanelContainer);
+    panel_container_ =
+        Shell::GetContainer(dst_root, kShellWindowId_PanelContainer);
 
     // The panel's parent already knows that the drag is in progress for this
     // panel.
     if (panel_container_ && GetTarget()->parent() != panel_container_)
       GetPanelLayoutManager(panel_container_)->StartDragging(GetTarget());
   }
   gfx::Point offset;
   gfx::Rect bounds(CalculateBoundsForDrag(location));
   if (!(details().bounds_change & WindowResizer::kBoundsChange_Resizes)) {
     window_state_->drag_details()->should_attach_to_shelf =
@@ skipping 28 matching lines @@
 PanelWindowResizer::PanelWindowResizer(WindowResizer* next_window_resizer,
                                        wm::WindowState* window_state)
     : WindowResizer(window_state),
       next_window_resizer_(next_window_resizer),
       panel_container_(NULL),
       initial_panel_container_(NULL),
       did_move_or_resize_(false),
       was_attached_(window_state->panel_attached()),
       weak_ptr_factory_(this) {
   DCHECK(details().is_resizable);
-  panel_container_ = Shell::GetContainer(
-      GetTarget()->GetRootWindow(),
-      internal::kShellWindowId_PanelContainer);
+  panel_container_ = Shell::GetContainer(GetTarget()->GetRootWindow(),
+                                         kShellWindowId_PanelContainer);
   initial_panel_container_ = panel_container_;
 }
 
 bool PanelWindowResizer::AttachToLauncher(const gfx::Rect& bounds,
                                           gfx::Point* offset) {
   bool should_attach = false;
   if (panel_container_) {
-    internal::PanelLayoutManager* panel_layout_manager =
+    PanelLayoutManager* panel_layout_manager =
         GetPanelLayoutManager(panel_container_);
     gfx::Rect launcher_bounds = ScreenUtil::ConvertRectFromScreen(
         GetTarget()->parent(),
         panel_layout_manager->shelf()->
         shelf_widget()->GetWindowBoundsInScreen());
     switch (panel_layout_manager->shelf()->alignment()) {
       case SHELF_ALIGNMENT_BOTTOM:
         if (bounds.bottom() >= (launcher_bounds.y() -
                                 kPanelSnapToLauncherDistance)) {
           should_attach = true;
@@ skipping 70 matching lines @@
 }
 
 void PanelWindowResizer::UpdateLauncherPosition() {
   if (panel_container_) {
     GetPanelLayoutManager(panel_container_)->shelf()->
         UpdateIconPositionForWindow(GetTarget());
   }
 }
 
 }  // namespace aura