Eliminate ash::internal namespace

ash/system/tray_update.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/system/tray_update.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
@@ skipping 42 matching lines @@
 
     case ash::UpdateObserver::UPDATE_SEVERE_RED:
       return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK_RED :
                     IDR_AURA_UBER_TRAY_UPDATE_RED;
   }
 
   NOTREACHED() << "Unknown update severity level.";
   return 0;
 }
 
-class UpdateView : public ash::internal::ActionableView {
+class UpdateView : public ash::ActionableView {
  public:
   explicit UpdateView(ash::UpdateObserver::UpdateSeverity severity) {
     SetLayoutManager(new
         views::BoxLayout(views::BoxLayout::kHorizontal,
         ash::kTrayPopupPaddingHorizontal, 0,
         ash::kTrayPopupPaddingBetweenItems));
 
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     views::ImageView* image =
-        new ash::internal::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
+        new ash::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
     image->SetImage(bundle.GetImageNamed(DecideResource(severity, true)).
         ToImageSkia());
 
     AddChildView(image);
     AddChildView(new views::Label(
         bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE)));
     SetAccessibleName(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE));
   }
 
   virtual ~UpdateView() {}
 
  private:
   // Overridden from ActionableView.
   virtual bool PerformAction(const ui::Event& event) OVERRIDE {
     ash::Shell::GetInstance()->
         system_tray_delegate()->RequestRestartForUpdate();
     return true;
   }
 
   DISALLOW_COPY_AND_ASSIGN(UpdateView);
 };
 
 }
 
 namespace ash {
-namespace internal {
-
 namespace tray {
 
 class UpdateNagger : public ui::LayerAnimationObserver {
  public:
   explicit UpdateNagger(SystemTrayItem* owner)
       : owner_(owner) {
     RestartTimer();
     owner_->system_tray()->GetWidget()->GetNativeView()->layer()->
         GetAnimator()->AddObserver(this);
   }
 
   virtual ~UpdateNagger() {
-    internal::StatusAreaWidget* status_area =
+    StatusAreaWidget* status_area =
         Shell::GetPrimaryRootWindowController()->shelf()->status_area_widget();
     if (status_area) {
       status_area->system_tray()->GetWidget()->GetNativeView()->layer()->
           GetAnimator()->RemoveObserver(this);
     }
   }
 
   void RestartTimer() {
     timer_.Stop();
     timer_.Start(FROM_HERE,
@@ skipping 70 matching lines @@
   severity_ = severity;
   SetImageFromResourceId(DecideResource(severity_, false));
   tray_view()->SetVisible(true);
   if (!Shell::GetPrimaryRootWindowController()->shelf()->IsVisible() &&
       !nagger_.get()) {
     // The shelf is not visible, and there is no nagger scheduled.
     nagger_.reset(new tray::UpdateNagger(this));
   }
 }
 
-}  // namespace internal
 }  // namespace ash