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

chrome/browser/profiles/profile_manager.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 <set>
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
+#include "content/common/content_notification_types.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 #include "grit/generated_resources.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_job.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
@@ skipping 55 matching lines @@
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   return profile_manager->GetLastUsedProfile(user_data_dir);
 }
 
 ProfileManager::ProfileManager() : logged_in_(false) {
   BrowserList::AddObserver(this);
 #if defined(OS_CHROMEOS)
   registrar_.Add(
       this,
-      NotificationType::LOGIN_USER_CHANGED,
+      chrome::LOGIN_USER_CHANGED,
       NotificationService::AllSources());
 #endif
 }
 
 ProfileManager::~ProfileManager() {
   BrowserList::RemoveObserver(this);
 
   // TODO(sail): fix http://crbug.com/88586
   if (profiles_to_delete_.size()) {
     BrowserThread::PostTask(
@@ skipping 217 matching lines @@
   profiles_info_.insert(std::make_pair(profile->GetPath(), info));
   return info;
 }
 
 Profile* ProfileManager::GetProfileByPath(const FilePath& path) const {
   ProfilesInfoMap::const_iterator iter = profiles_info_.find(path);
   return (iter == profiles_info_.end()) ? NULL : iter->second->profile.get();
 }
 
 void ProfileManager::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
 #if defined(OS_CHROMEOS)
-  if (type == NotificationType::LOGIN_USER_CHANGED) {
+  if (type == chrome::LOGIN_USER_CHANGED) {
     const CommandLine& command_line = *CommandLine::ForCurrentProcess();
     if (!command_line.HasSwitch(switches::kTestType)) {
       // This will fail when running on non cros os.
       // TODO(davemoore) Need to mock this enough to enable testing.
       CHECK(chromeos::CrosLibrary::Get()->EnsureLoaded());
       // If we don't have a mounted profile directory we're in trouble.
       // TODO(davemoore) Once we have better api this check should ensure that
       // our profile directory is the one that's mounted, and that it's mounted
       // as the current user.
       CHECK(chromeos::CrosLibrary::Get()->GetCryptohomeLibrary()->IsMounted());
@@ skipping 208 matching lines @@
 }
 
 // static
 bool ProfileManager::IsMultipleProfilesEnabled() {
 #if defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)
   return true;
 #else
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles);
 #endif
 }