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

chrome/browser/browser_signin.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/browser_signin.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/constrained_html_ui.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 class BrowserSigninResourcesSource : public ChromeURLDataManager::DataSource {
  public:
   BrowserSigninResourcesSource()
       : DataSource(chrome::kChromeUIDialogHost, MessageLoop::current()) {
   }
 
   virtual void StartDataRequest(const std::string& path,
@@ skipping 205 matching lines @@
   ShowSigninTabModal(tab_contents);
 }
 
 std::string BrowserSignin::GetSignedInUsername() const {
   std::string username =
       profile_->GetPrefs()->GetString(prefs::kGoogleServicesUsername);
   VLOG(1) << "GetSignedInUsername: " << username;
   return username;
 }
 
-void BrowserSignin::Observe(NotificationType type,
+void BrowserSignin::Observe(int type,
                             const NotificationSource& source,
                             const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::GOOGLE_SIGNIN_SUCCESSFUL: {
+  switch (type) {
+    case chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL: {
       VLOG(1) << "GOOGLE_SIGNIN_SUCCESSFUL";
       if (delegate_)
         delegate_->OnLoginSuccess();
       // Close the dialog.
       OnLoginFinished();
       break;
     }
-    case NotificationType::GOOGLE_SIGNIN_FAILED: {
+    case chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED: {
       VLOG(1) << "GOOGLE_SIGNIN_FAILED";
       // The signin failed, refresh the UI with error information.
       html_dialog_ui_delegate_->ReloadUI();
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
@@ skipping 22 matching lines @@
 ProfileSyncService* BrowserSignin::GetProfileSyncService() const {
   return profile_->GetProfileSyncService();
 }
 
 BrowserSigninHtml* BrowserSignin::CreateHtmlDialogUI() {
   return new BrowserSigninHtml(this, suggested_email_, login_message_);
 }
 
 void BrowserSignin::RegisterAuthNotifications() {
   registrar_.Add(this,
-                 NotificationType::GOOGLE_SIGNIN_SUCCESSFUL,
+                 chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
                  Source<Profile>(profile_));
   registrar_.Add(this,
-                 NotificationType::GOOGLE_SIGNIN_FAILED,
+                 chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED,
                  Source<Profile>(profile_));
 }
 
 void BrowserSignin::UnregisterAuthNotifications() {
   registrar_.Remove(this,
-                    NotificationType::GOOGLE_SIGNIN_SUCCESSFUL,
+                    chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
                     Source<Profile>(profile_));
   registrar_.Remove(this,
-                    NotificationType::GOOGLE_SIGNIN_FAILED,
+                    chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED,
                     Source<Profile>(profile_));
 }
 
 void BrowserSignin::ShowSigninTabModal(TabContents* tab_contents) {
 //  TODO(johnnyg): Need a linux views implementation for ConstrainedHtmlDialog.
 #if defined(OS_WIN) || defined(OS_CHROMEOS) || !defined(TOOLKIT_VIEWS)
   html_dialog_ui_delegate_ = CreateHtmlDialogUI();
   ConstrainedHtmlUI::CreateConstrainedHtmlDialog(profile_,
                                                  html_dialog_ui_delegate_,
                                                  tab_contents);
 #endif
 }