content: Remove unnecessary content:: from Notification classes.

R=jam@chromium.org

Review URL: http://codereview.chromium.org/8547003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110971 0039d316-1c4b-4281-b951-d872f2087c98

content/public/browser/notification_registrar.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -28,7 +28,7 @@ struct NotificationRegistrar::Record {
 
   NotificationObserver* observer;
   int type;
-  content::NotificationSource source;
+  NotificationSource source;
   base::PlatformThreadId thread_id;
 };
 
@@ -54,7 +54,7 @@ NotificationRegistrar::~NotificationRegistrar() {
 
 void NotificationRegistrar::Add(NotificationObserver* observer,
                                 int type,
-                                const content::NotificationSource& source) {
+                                const NotificationSource& source) {
   DCHECK(!IsRegistered(observer, type, source)) << "Duplicate registration.";
 
   Record record = { observer, type, source, base::PlatformThread::CurrentId() };
@@ -65,7 +65,7 @@ void NotificationRegistrar::Add(NotificationObserver* observer,
 
 void NotificationRegistrar::Remove(NotificationObserver* observer,
                                    int type,
-                                   const content::NotificationSource& source) {
+                                   const NotificationSource& source) {
   if (!IsRegistered(observer, type, source)) {
     NOTREACHED() << "Trying to remove unregistered observer of type " <<
         type << " from list of size " << registered_.size() << ".";
@@ -114,10 +114,9 @@ bool NotificationRegistrar::IsEmpty() const {
   return registered_.empty();
 }
 
-bool NotificationRegistrar::IsRegistered(
-    NotificationObserver* observer,
-    int type,
-    const content::NotificationSource& source) {
+bool NotificationRegistrar::IsRegistered(NotificationObserver* observer,
+                                         int type,
+                                         const NotificationSource& source) {
   Record record = { observer, type, source };
   return std::find(registered_.begin(), registered_.end(), record) !=
       registered_.end();

content/public/browser/notification_registrar.h

@@ -33,10 +33,10 @@ class CONTENT_EXPORT NotificationRegistrar {
   // Wrappers around NotificationService::[Add|Remove]Observer.
   void Add(NotificationObserver* observer,
            int type,
-           const content::NotificationSource& source);
+           const NotificationSource& source);
   void Remove(NotificationObserver* observer,
               int type,
-              const content::NotificationSource& source);
+              const NotificationSource& source);
 
   // Unregisters all notifications.
   void RemoveAll();
@@ -48,7 +48,7 @@ class CONTENT_EXPORT NotificationRegistrar {
   // specified details.
   bool IsRegistered(NotificationObserver* observer,
                     int type,
-                    const content::NotificationSource& source);
+                    const NotificationSource& source);
 
  private:
   struct Record;

content/public/browser/notification_service.h

@@ -6,8 +6,8 @@
 // happen in various parts of the application, and allows users to register
 // observers for various classes of events that they're interested in.
 
-#ifndef CONTENT_PUBLIC_NOTIFICATION_SERVICE_H_
-#define CONTENT_PUBLIC_NOTIFICATION_SERVICE_H_
+#ifndef CONTENT_PUBLIC_BROWSER_NOTIFICATION_SERVICE_H_
+#define CONTENT_PUBLIC_BROWSER_NOTIFICATION_SERVICE_H_
 #pragma once
 
 #include "content/common/content_export.h"
@@ -56,9 +56,9 @@ class CONTENT_EXPORT NotificationService {
 
   // Returns a NotificationDetails object that represents a lack of details
   // associated with a notification.  (This is effectively a null pointer.)
-  static Details<void> NoDetails() { return content::Details<void>(NULL); }
+  static Details<void> NoDetails() { return Details<void>(NULL); }
 };
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_NOTIFICATION_SERVICE_H_
+#endif  // CONTENT_PUBLIC_BROWSER_NOTIFICATION_SERVICE_H_

content/public/browser/notification_types.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_PUBLIC_BROWSER_NOTIFICATION_TYPE_H_
-#define CONTENT_PUBLIC_BROWSER_NOTIFICATION_TYPE_H_
+#ifndef CONTENT_PUBLIC_BROWSER_NOTIFICATION_TYPES_H_
+#define CONTENT_PUBLIC_BROWSER_NOTIFICATION_TYPES_H_
 #pragma once
 
 // This file describes various types used to describe and filter notifications
@@ -443,4 +443,4 @@ enum NotificationType {
 
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_BROWSER_NOTIFICATION_TYPE_H_
+#endif  // CONTENT_PUBLIC_BROWSER_NOTIFICATION_TYPES_H_