Moving notification types which are chrome specific to a new header file chrome_notification_type...

chrome/browser/ui/login/login_prompt.cc

 // 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.
 
 #include "chrome/browser/ui/login/login_prompt.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/synchronization/lock.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/browser/tab_contents/constrained_window.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
@@ skipping 159 matching lines @@
   // Reference is no longer valid.
   request_ = NULL;
 
   // Give up on auth if the request was cancelled.
   CancelAuth();
 }
 
 void LoginHandler::AddObservers() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  registrar_.Add(this, NotificationType::AUTH_SUPPLIED,
+  registrar_.Add(this, chrome::NOTIFICATION_AUTH_SUPPLIED,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::AUTH_CANCELLED,
+  registrar_.Add(this, chrome::NOTIFICATION_AUTH_CANCELLED,
                  NotificationService::AllSources());
 }
 
 void LoginHandler::RemoveObservers() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  registrar_.Remove(this, NotificationType::AUTH_SUPPLIED,
+  registrar_.Remove(this, chrome::NOTIFICATION_AUTH_SUPPLIED,
                     NotificationService::AllSources());
-  registrar_.Remove(this, NotificationType::AUTH_CANCELLED,
+  registrar_.Remove(this, chrome::NOTIFICATION_AUTH_CANCELLED,
                     NotificationService::AllSources());
 
   DCHECK(registrar_.IsEmpty());
 }
 
-void LoginHandler::Observe(NotificationType type,
+void LoginHandler::Observe(int type,
                            const NotificationSource& source,
                            const NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(type == NotificationType::AUTH_SUPPLIED ||
-         type == NotificationType::AUTH_CANCELLED);
+  DCHECK(type == chrome::NOTIFICATION_AUTH_SUPPLIED ||
+         type == chrome::NOTIFICATION_AUTH_CANCELLED);
 
   TabContents* requesting_contents = GetTabContentsForLogin();
   if (!requesting_contents)
     return;
 
   // Break out early if we aren't interested in the notification.
   if (WasAuthHandled())
     return;
 
   LoginNotificationDetails* login_details =
       Details<LoginNotificationDetails>(details).ptr();
 
   // WasAuthHandled() should always test positive before we publish
   // AUTH_SUPPLIED or AUTH_CANCELLED notifications.
   DCHECK(login_details->handler() != this);
 
   // Only handle notification for the identical auth info.
   if (*login_details->handler()->auth_info() != *auth_info())
     return;
 
   // Set or cancel the auth in this handler.
-  if (type == NotificationType::AUTH_SUPPLIED) {
+  if (type == chrome::NOTIFICATION_AUTH_SUPPLIED) {
     AuthSuppliedLoginNotificationDetails* supplied_details =
         Details<AuthSuppliedLoginNotificationDetails>(details).ptr();
     SetAuth(supplied_details->username(), supplied_details->password());
   } else {
-    DCHECK(type == NotificationType::AUTH_CANCELLED);
+    DCHECK(type == chrome::NOTIFICATION_AUTH_CANCELLED);
     CancelAuth();
   }
 }
 
 void LoginHandler::SetModel(LoginModel* model) {
   if (login_model_)
     login_model_->SetObserver(NULL);
   login_model_ = model;
   if (login_model_)
     login_model_->SetObserver(this);
@@ skipping 10 matching lines @@
 
   NotificationService* service = NotificationService::current();
   NavigationController* controller = NULL;
 
   TabContents* requesting_contents = GetTabContentsForLogin();
   if (requesting_contents)
     controller = &requesting_contents->controller();
 
   LoginNotificationDetails details(this);
 
-  service->Notify(NotificationType::AUTH_NEEDED,
+  service->Notify(chrome::NOTIFICATION_AUTH_NEEDED,
                   Source<NavigationController>(controller),
                   Details<LoginNotificationDetails>(&details));
 }
 
 void LoginHandler::NotifyAuthCancelled() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(WasAuthHandled());
 
   NotificationService* service = NotificationService::current();
   NavigationController* controller = NULL;
 
   TabContents* requesting_contents = GetTabContentsForLogin();
   if (requesting_contents)
     controller = &requesting_contents->controller();
 
   LoginNotificationDetails details(this);
 
-  service->Notify(NotificationType::AUTH_CANCELLED,
+  service->Notify(chrome::NOTIFICATION_AUTH_CANCELLED,
                   Source<NavigationController>(controller),
                   Details<LoginNotificationDetails>(&details));
 }
 
 void LoginHandler::NotifyAuthSupplied(const string16& username,
                                       const string16& password) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(WasAuthHandled());
 
   TabContents* requesting_contents = GetTabContentsForLogin();
   if (!requesting_contents)
     return;
 
   NotificationService* service = NotificationService::current();
   NavigationController* controller = &requesting_contents->controller();
   AuthSuppliedLoginNotificationDetails details(this, username, password);
 
-  service->Notify(NotificationType::AUTH_SUPPLIED,
+  service->Notify(chrome::NOTIFICATION_AUTH_SUPPLIED,
                   Source<NavigationController>(controller),
                   Details<AuthSuppliedLoginNotificationDetails>(&details));
 }
 
 void LoginHandler::ReleaseSoon() {
   if (!TestAndSetAuthHandled()) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         NewRunnableMethod(this, &LoginHandler::CancelAuthDeferred));
     BrowserThread::PostTask(
@@ skipping 158 matching lines @@
 // Public API
 
 LoginHandler* CreateLoginPrompt(net::AuthChallengeInfo* auth_info,
                                 net::URLRequest* request) {
   LoginHandler* handler = LoginHandler::Create(auth_info, request);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, new LoginDialogTask(
           request->url(), auth_info, handler));
   return handler;
 }