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

chrome/browser/extensions/extension_omnibox_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_omnibox_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_constants.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 namespace events {
 const char kOnInputStarted[] = "omnibox.onInputStarted";
 const char kOnInputChanged[] = "omnibox.onInputChanged";
 const char kOnInputEntered[] = "omnibox.onInputEntered";
 const char kOnInputCancelled[] = "omnibox.onInputCancelled";
 };  // namespace events
 
 namespace {
 const char kDescriptionStylesOrderError[] =
@@ skipping 61 matching lines @@
     Profile* profile, const std::string& extension_id,
     const std::string& input) {
   ListValue args;
   args.Set(0, Value::CreateStringValue(input));
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
 
   profile->GetExtensionEventRouter()->DispatchEventToExtension(
       extension_id, events::kOnInputEntered, json_args, profile, GURL());
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_OMNIBOX_INPUT_ENTERED,
-      content::Source<Profile>(profile), NotificationService::NoDetails());
+      content::Source<Profile>(profile),
+      content::NotificationService::NoDetails());
 }
 
 // static
 void ExtensionOmniboxEventRouter::OnInputCancelled(
     Profile* profile, const std::string& extension_id) {
   profile->GetExtensionEventRouter()->DispatchEventToExtension(
       extension_id, events::kOnInputCancelled, "[]", profile, GURL());
 }
 
 bool OmniboxSendSuggestionsFunction::RunImpl() {
@@ skipping 18 matching lines @@
       EXTENSION_FUNCTION_VALIDATE(
           suggestion_value->GetList(kSuggestionDescriptionStyles, &styles));
       EXTENSION_FUNCTION_VALIDATE(suggestion.ReadStylesFromValue(*styles));
     } else {
       suggestion.description_styles.clear();
       suggestion.description_styles.push_back(
           ACMatchClassification(0, ACMatchClassification::NONE));
     }
   }
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_OMNIBOX_SUGGESTIONS_READY,
       content::Source<Profile>(profile_),
       content::Details<ExtensionOmniboxSuggestions>(&suggestions));
 
   return true;
 }
 
 bool OmniboxSetDefaultSuggestionFunction::RunImpl() {
   ExtensionOmniboxSuggestion suggestion;
   DictionaryValue* suggestion_value;
@@ skipping 10 matching lines @@
     suggestion.description_styles.clear();
     suggestion.description_styles.push_back(
         ACMatchClassification(0, ACMatchClassification::NONE));
   }
 
   // Store the suggestion in the extension's runtime data.
   GetPropertyAccessor().SetProperty(
       profile_->GetExtensionService()->GetPropertyBag(GetExtension()),
       suggestion);
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_OMNIBOX_DEFAULT_SUGGESTION_CHANGED,
       content::Source<Profile>(profile_),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 
   return true;
 }
 
 ExtensionOmniboxSuggestion::ExtensionOmniboxSuggestion() {}
 
 ExtensionOmniboxSuggestion::~ExtensionOmniboxSuggestion() {}
 
 bool ExtensionOmniboxSuggestion::ReadStylesFromValue(
     const ListValue& styles_value) {
@@ skipping 97 matching lines @@
                             extension_misc::APP_LAUNCH_BUCKET_BOUNDARY);
 
   // Look at the preferences to find the right launch container.  If no
   // preference is set, launch as a regular tab.
   extension_misc::LaunchContainer launch_container =
       service->extension_prefs()->GetLaunchContainer(
           extension, ExtensionPrefs::LAUNCH_REGULAR);
 
   Browser::OpenApplication(profile, extension, launch_container, disposition);
 }