Eliminate ash::internal namespace

ash/system/chromeos/power/power_status_view.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/chromeos/power/power_status_view.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/chromeos/power/power_status.h"
 #include "ash/system/chromeos/power/tray_power.h"
 #include "ash/system/tray/fixed_sized_image_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace ash {
-namespace internal {
 
 // Padding between battery status text and battery icon on default view.
 const int kPaddingBetweenBatteryStatusAndIcon = 3;
 
 PowerStatusView::PowerStatusView(ViewType view_type,
                                  bool default_view_right_align)
     : default_view_right_align_(default_view_right_align),
       status_label_(NULL),
       time_label_(NULL),
       time_status_label_(NULL),
@@ skipping 41 matching lines @@
 
     icon_ = new views::ImageView;
     AddChildView(icon_);
   } else {
     // PowerStatusView is left aligned on the system tray pop up item.
     views::BoxLayout* layout =
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
                              kTrayPopupPaddingBetweenItems);
     SetLayoutManager(layout);
 
-    icon_ =
-        new ash::internal::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
+    icon_ = new ash::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
     AddChildView(icon_);
 
     AddChildView(percentage_label_);
     AddChildView(time_status_label_);
   }
 }
 
 void PowerStatusView::LayoutNotificationView() {
   SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
@@ skipping 112 matching lines @@
 void PowerStatusView::Layout() {
   views::View::Layout();
 
   // Move the time_status_label_ closer to percentage_label_.
   if (percentage_label_ && time_status_label_ &&
       percentage_label_->visible() && time_status_label_->visible()) {
     time_status_label_->SetX(percentage_label_->bounds().right() + 1);
   }
 }
 
-}  // namespace internal
 }  // namespace ash