Move Singleton and related structs to namespace base

components/app_modal/app_modal_dialog_queue.h

 // 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.
 
 #ifndef COMPONENTS_APP_MODAL_APP_MODAL_DIALOG_QUEUE_H_
 #define COMPONENTS_APP_MODAL_APP_MODAL_DIALOG_QUEUE_H_
 
 #include <deque>
 
 #include "base/basictypes.h"
 
+namespace base {
 template <typename T> struct DefaultSingletonTraits;
+}
 
 namespace app_modal {
 
 class AppModalDialog;
 
 // Keeps a queue of AppModalDialogs, making sure only one app modal
 // dialog is shown at a time.
 // This class is a singleton.
 class AppModalDialogQueue {
  public:
@@ skipping 29 matching lines @@
   bool HasActiveDialog() const;
 
   AppModalDialog* active_dialog() { return active_dialog_; }
 
   // Iterators to walk the queue. The queue does not include the currently
   // active app modal dialog box.
   iterator begin() { return app_modal_dialog_queue_.begin(); }
   iterator end() { return app_modal_dialog_queue_.end(); }
 
  private:
-  friend struct DefaultSingletonTraits<AppModalDialogQueue>;
+  friend struct base::DefaultSingletonTraits<AppModalDialogQueue>;
 
   AppModalDialogQueue();
   ~AppModalDialogQueue();
 
   // Shows |dialog| and notifies the BrowserList that a modal dialog is showing.
   void ShowModalDialog(AppModalDialog* dialog);
 
   // Returns the next dialog to show. This removes entries from
   // app_modal_dialog_queue_ until one is valid or the queue is empty. This
   // returns NULL if there are no more dialogs, or all the dialogs in the queue
@@ skipping 11 matching lines @@
   // Stores if |ShowModalDialog()| is currently being called on an app-modal
   // dialog.
   bool showing_modal_dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(AppModalDialogQueue);
 };
 
 }  // namespace app_modal
 
 #endif  // COMPONENTS_APP_MODAL_APP_MODAL_DIALOG_QUEUE_H_