Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

chrome/browser/ui/webui/options/manage_profile_handler.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/webui/options/manage_profile_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/value_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 
 ManageProfileHandler::ManageProfileHandler() {
 }
 
 ManageProfileHandler::~ManageProfileHandler() {
 }
 
 void ManageProfileHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
     { "manageProfilesTitle", IDS_PROFILES_MANAGE_TITLE },
     { "manageProfilesNameLabel", IDS_PROFILES_MANAGE_NAME_LABEL },
     { "manageProfilesDuplicateNameError",
         IDS_PROFILES_MANAGE_DUPLICATE_NAME_ERROR },
     { "manageProfilesIconLabel", IDS_PROFILES_MANAGE_ICON_LABEL },
     { "deleteProfileTitle", IDS_PROFILES_DELETE_TITLE },
     { "deleteProfileOK", IDS_PROFILES_DELETE_OK_BUTTON_LABEL },
     { "deleteProfileMessage", IDS_PROFILES_DELETE_MESSAGE },
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
 }
 
 void ManageProfileHandler::Initialize() {
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   SendProfileNames();
 }
 
 void ManageProfileHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("setProfileNameAndIcon",
       base::Bind(&ManageProfileHandler::SetProfileNameAndIcon,
                  base::Unretained(this)));
   web_ui_->RegisterMessageCallback("deleteProfile",
       base::Bind(&ManageProfileHandler::DeleteProfile,
                  base::Unretained(this)));
@@ skipping 112 matching lines @@
   profile_value.SetString("name", cache.GetNameOfProfileAtIndex(index));
   profile_value.SetString("iconURL",
                            cache.GetDefaultAvatarIconUrl(icon_index));
   profile_value.Set("filePath", base::CreateFilePathValue(profile_path));
   profile_value.SetBoolean("isCurrentProfile",
                             profile_path == current_profile_path);
 
   web_ui_->CallJavascriptFunction("ManageProfileOverlay.setProfileInfo",
                                   profile_value);
 }