summaryrefslogtreecommitdiffstats
path: root/chrome/browser/component_updater
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 02:52:53 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 02:52:53 +0000
commit6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c (patch)
treea75584b11b8ef188b4eb3376b9146e063823a916 /chrome/browser/component_updater
parentbf3ee201c1ca5112f7fd173fc4785aa52920c5c0 (diff)
downloadchromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.zip
chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.tar.gz
chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.tar.bz2
Move NotificationObserver, NotificationSource, and NotificationDetails to content/public/browser.
This patch got way bigger than I wanted, but once I moved NotificationDetails, I figured I might as well mvoe the others since they're in the same files. In hindsight, I should have converted a subset of files at a time by leaving a using statement in the header. BUG=98716 TBR=joi git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/component_updater')
-rw-r--r--chrome/browser/component_updater/component_updater_service.cc8
-rw-r--r--chrome/browser/component_updater/component_updater_service_unittest.cc2
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc
index 8dc6418..84e37d4d5 100644
--- a/chrome/browser/component_updater/component_updater_service.cc
+++ b/chrome/browser/component_updater/component_updater_service.cc
@@ -349,7 +349,7 @@ ComponentUpdateService::Status CrxUpdateService::Start() {
NotificationService::current()->Notify(
chrome::NOTIFICATION_COMPONENT_UPDATER_STARTED,
- Source<ComponentUpdateService>(this),
+ content::Source<ComponentUpdateService>(this),
NotificationService::NoDetails());
timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(config_->InitialDelay()),
@@ -383,7 +383,7 @@ void CrxUpdateService::ScheduleNextRun(bool step_delay) {
if (!step_delay) {
NotificationService::current()->Notify(
chrome::NOTIFICATION_COMPONENT_UPDATER_SLEEPING,
- Source<ComponentUpdateService>(this),
+ content::Source<ComponentUpdateService>(this),
NotificationService::NoDetails());
// Zero is only used for unit tests.
if (0 == delay)
@@ -636,7 +636,7 @@ void CrxUpdateService::OnParseUpdateManifestSucceeded(
NotificationService::current()->Notify(
chrome::NOTIFICATION_COMPONENT_UPDATE_FOUND,
- Source<std::string>(&crx->id),
+ content::Source<std::string>(&crx->id),
NotificationService::NoDetails());
}
@@ -683,7 +683,7 @@ void CrxUpdateService::OnURLFetchComplete(const URLFetcher* source,
NotificationService::current()->Notify(
chrome::NOTIFICATION_COMPONENT_UPDATE_READY,
- Source<std::string>(&context->id),
+ content::Source<std::string>(&context->id),
NotificationService::NoDetails());
BrowserThread::PostDelayedTask(BrowserThread::FILE, FROM_HERE,
diff --git a/chrome/browser/component_updater/component_updater_service_unittest.cc b/chrome/browser/component_updater/component_updater_service_unittest.cc
index 5190a7d..496e765 100644
--- a/chrome/browser/component_updater/component_updater_service_unittest.cc
+++ b/chrome/browser/component_updater/component_updater_service_unittest.cc
@@ -15,7 +15,7 @@
#include "chrome/test/base/test_url_request_context_getter.h"
#include "content/browser/browser_thread.h"
#include "content/common/net/url_fetcher.h"
-#include "content/common/notification_observer.h"
+#include "content/public/browser/notification_observer.h"
#include "content/common/notification_service.h"
#include "content/test/test_notification_tracker.h"