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

chrome/browser/extensions/extension_webstore_private_api.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/extensions/extension_webstore_private_api.h"
 
 #include <string>
 #include <vector>
 
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_install_dialog.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/net/gaia/gaia_constants.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/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 const char kIconDataKey[] = "iconData";
 const char kIdKey[] = "id";
 const char kLocalizedNameKey[] = "localizedName";
@@ skipping 542 matching lines @@
   if (!tab)
     return false;
 
   // We return the result asynchronously, so we addref to keep ourself alive.
   // Matched with a Release in OnLoginSuccess() and OnLoginFailure().
   AddRef();
 
   // Start listening for notifications about the token.
   TokenService* token_service = profile->GetTokenService();
   registrar_.Add(this,
-                 NotificationType::TOKEN_AVAILABLE,
+                 chrome::NOTIFICATION_TOKEN_AVAILABLE,
                  Source<TokenService>(token_service));
   registrar_.Add(this,
-                 NotificationType::TOKEN_REQUEST_FAILED,
+                 chrome::NOTIFICATION_TOKEN_REQUEST_FAILED,
                  Source<TokenService>(token_service));
 
   GetBrowserSignin(profile)->RequestSignin(tab,
                                            ASCIIToUTF16(preferred_email),
                                            GetLoginMessage(),
                                            this);
 
   // The response will be sent asynchronously in OnLoginSuccess/OnLoginFailure.
   return true;
 }
@@ skipping 31 matching lines @@
   waiting_for_token_ = true;
 }
 
 void PromptBrowserLoginFunction::OnLoginFailure(
     const GoogleServiceAuthError& error) {
   SendResponse(false);
   // Matches the AddRef in RunImpl().
   Release();
 }
 
-void PromptBrowserLoginFunction::Observe(NotificationType type,
+void PromptBrowserLoginFunction::Observe(int type,
                                          const NotificationSource& source,
                                          const NotificationDetails& details) {
   // Make sure this notification is for the service we are interested in.
   std::string service;
-  if (type == NotificationType::TOKEN_AVAILABLE) {
+  if (type == chrome::NOTIFICATION_TOKEN_AVAILABLE) {
     TokenService::TokenAvailableDetails* available =
         Details<TokenService::TokenAvailableDetails>(details).ptr();
     service = available->service();
-  } else if (type == NotificationType::TOKEN_REQUEST_FAILED) {
+  } else if (type == chrome::NOTIFICATION_TOKEN_REQUEST_FAILED) {
     TokenService::TokenRequestFailedDetails* failed =
         Details<TokenService::TokenRequestFailedDetails>(details).ptr();
     service = failed->service();
   } else {
     NOTREACHED();
   }
 
   if (service != GaiaConstants::kGaiaService) {
     return;
   }
 
   DCHECK(waiting_for_token_);
 
   result_.reset(CreateLoginResult(profile_->GetOriginalProfile()));
   SendResponse(true);
 
   // Matches the AddRef in RunImpl().
   Release();
 }