Eliminate ash::internal namespace

ash/display/output_configurator_animation.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/display/output_configurator_animation.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 
 namespace ash {
-namespace internal {
 namespace {
 
 const int kFadingAnimationDurationInMS = 200;
 const int kFadingTimeoutDurationInSeconds = 10;
 
 // CallbackRunningObserver accepts multiple layer animations and
 // runs the specified |callback| when all of the animations have finished.
 class CallbackRunningObserver {
  public:
   CallbackRunningObserver(base::Closure callback)
@@ skipping 83 matching lines @@
   // safety.  These layers remain to hide root windows and will be deleted
   // after the animation of OnDisplayModeChanged().
   aura::Window::Windows root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   for (aura::Window::Windows::const_iterator it = root_windows.begin();
        it != root_windows.end(); ++it) {
     aura::Window* root_window = *it;
     ui::Layer* hiding_layer = new ui::Layer(ui::LAYER_SOLID_COLOR);
     hiding_layer->SetColor(SK_ColorBLACK);
     hiding_layer->SetBounds(root_window->bounds());
-    ui::Layer* parent = ash::Shell::GetContainer(
-        root_window,
-        ash::internal::kShellWindowId_OverlayContainer)->layer();
+    ui::Layer* parent =
+        ash::Shell::GetContainer(root_window,
+                                 ash::kShellWindowId_OverlayContainer)->layer();
     parent->Add(hiding_layer);
 
     hiding_layer->SetOpacity(0.0);
 
     ui::ScopedLayerAnimationSettings settings(hiding_layer->GetAnimator());
     settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
         kFadingAnimationDurationInMS));
     observer->AddNewAnimator(hiding_layer->GetAnimator());
     hiding_layer->SetOpacity(1.0f);
     hiding_layer->SetVisible(true);
@@ skipping 36 matching lines @@
        it != root_windows.end(); ++it) {
     aura::Window* root_window = *it;
     ui::Layer* hiding_layer = NULL;
     if (hiding_layers_.find(root_window) == hiding_layers_.end()) {
       // In case of the transition from mirroring->non-mirroring, new root
       // windows appear and we do not have the black layers for them.  Thus
       // we need to create the layer and make it visible.
       hiding_layer = new ui::Layer(ui::LAYER_SOLID_COLOR);
       hiding_layer->SetColor(SK_ColorBLACK);
       hiding_layer->SetBounds(root_window->bounds());
-      ui::Layer* parent = ash::Shell::GetContainer(
-          root_window,
-          ash::internal::kShellWindowId_OverlayContainer)->layer();
+      ui::Layer* parent =
+          ash::Shell::GetContainer(
+              root_window, ash::kShellWindowId_OverlayContainer)->layer();
       parent->Add(hiding_layer);
       hiding_layer->SetOpacity(1.0f);
       hiding_layer->SetVisible(true);
       hiding_layers_[root_window] = hiding_layer;
     } else {
       hiding_layer = hiding_layers_[root_window];
       if (hiding_layer->bounds() != root_window->bounds())
         hiding_layer->SetBounds(root_window->bounds());
     }
 
@@ skipping 21 matching lines @@
 void OutputConfiguratorAnimation::ClearHidingLayers() {
   if (timer_) {
     timer_->Stop();
     timer_.reset();
   }
   STLDeleteContainerPairSecondPointers(
       hiding_layers_.begin(), hiding_layers_.end());
   hiding_layers_.clear();
 }
 
-}  // namespace internal
 }  // namespace ash