Eliminate ash::internal namespace

ash/system/web_notification/web_notification_tray.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/web_notification/web_notification_tray.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
@@ skipping 45 matching lines @@
 
 namespace ash {
 namespace {
 
 // Menu commands
 const int kToggleQuietMode = 0;
 const int kEnableQuietModeDay = 2;
 
 }
 
-namespace internal {
 namespace {
 
 const SkColor kWebNotificationColorNoUnread = SkColorSetA(SK_ColorWHITE, 128);
 const SkColor kWebNotificationColorWithUnread = SK_ColorWHITE;
 
 }
 
 // Observes the change of work area (including temporary change by auto-hide)
 // and notifies MessagePopupCollection.
 class WorkAreaObserver : public ShelfLayoutManagerObserver,
@@ skipping 149 matching lines @@
     bubble->InitializeContents(bubble_view);
   }
 
   message_center::MessageBubbleBase* bubble() const { return bubble_.get(); }
 
   // Convenience accessors.
   views::TrayBubbleView* bubble_view() const { return bubble_->bubble_view(); }
 
  private:
   scoped_ptr<message_center::MessageBubbleBase> bubble_;
-  scoped_ptr<internal::TrayBubbleWrapper> bubble_wrapper_;
+  scoped_ptr<TrayBubbleWrapper> bubble_wrapper_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationBubbleWrapper);
 };
 
 class WebNotificationButton : public views::CustomButton {
  public:
   WebNotificationButton(views::ButtonListener* listener)
       : views::CustomButton(listener),
         is_bubble_visible_(false),
         unread_count_(0) {
@@ skipping 43 matching lines @@
   }
 
   bool is_bubble_visible_;
   int unread_count_;
 
   views::Label* unread_label_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationButton);
 };
 
-}  // namespace internal
-
-WebNotificationTray::WebNotificationTray(
-    internal::StatusAreaWidget* status_area_widget)
+WebNotificationTray::WebNotificationTray(StatusAreaWidget* status_area_widget)
     : TrayBackgroundView(status_area_widget),
       button_(NULL),
       show_message_center_on_unlock_(false),
       should_update_tray_content_(false),
       should_block_shelf_auto_hide_(false) {
-  button_ = new internal::WebNotificationButton(this);
+  button_ = new WebNotificationButton(this);
   button_->set_triggerable_event_flags(
       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON);
   tray_container()->AddChildView(button_);
   SetContentsBackground();
   tray_container()->SetBorder(views::Border::NullBorder());
   SetVisible(false);
   message_center_tray_.reset(new message_center::MessageCenterTray(
       this,
       message_center::MessageCenter::Get()));
   popup_collection_.reset(new message_center::MessagePopupCollection(
       ash::Shell::GetContainer(
           status_area_widget->GetNativeView()->GetRootWindow(),
-          internal::kShellWindowId_StatusContainer),
+          kShellWindowId_StatusContainer),
       message_center(),
       message_center_tray_.get(),
       ash::switches::UseAlternateShelfLayout()));
-  work_area_observer_.reset(new internal::WorkAreaObserver());
+  work_area_observer_.reset(new WorkAreaObserver());
   work_area_observer_->StartObserving(
       popup_collection_.get(),
       status_area_widget->GetNativeView()->GetRootWindow());
   OnMessageCenterTrayChanged();
 }
 
 WebNotificationTray::~WebNotificationTray() {
   // Release any child views that might have back pointers before ~View().
   message_center_bubble_.reset();
   popup_collection_.reset();
@@ skipping 36 matching lines @@
     }
     default:
       NOTREACHED();
   }
 
   message_center_bubble->SetMaxHeight(std::max(0,
                                                max_height - GetTraySpacing()));
   if (show_settings)
     message_center_bubble->SetSettingsVisible();
   message_center_bubble_.reset(
-      new internal::WebNotificationBubbleWrapper(this, message_center_bubble));
+      new WebNotificationBubbleWrapper(this, message_center_bubble));
 
   status_area_widget()->SetHideSystemNotifications(true);
   GetShelfLayoutManager()->UpdateAutoHideState();
   button_->SetBubbleVisible(true);
   SetDrawBackgroundAsActive(true);
   return true;
 }
 
 bool WebNotificationTray::ShowMessageCenter() {
   return ShowMessageCenterInternal(false /* show_settings */);
@@ skipping 55 matching lines @@
 }
 
 void WebNotificationTray::UpdateAfterLoginStatusChange(
     user::LoginStatus login_status) {
   OnMessageCenterTrayChanged();
 }
 
 void WebNotificationTray::SetShelfAlignment(ShelfAlignment alignment) {
   if (alignment == shelf_alignment())
     return;
-  internal::TrayBackgroundView::SetShelfAlignment(alignment);
+  TrayBackgroundView::SetShelfAlignment(alignment);
   tray_container()->SetBorder(views::Border::NullBorder());
   // Destroy any existing bubble so that it will be rebuilt correctly.
   message_center_tray_->HideMessageCenterBubble();
   message_center_tray_->HidePopupBubble();
 }
 
 void WebNotificationTray::AnchorUpdated() {
   if (message_center_bubble()) {
     message_center_bubble()->bubble_view()->UpdateBubble();
     UpdateBubbleViewArrow(message_center_bubble()->bubble_view());
@@ skipping 150 matching lines @@
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return NULL;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash