summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui/history2_ui.cc
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/ui/webui/history2_ui.cc
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/ui/webui/history2_ui.cc')
-rw-r--r--chrome/browser/ui/webui/history2_ui.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/ui/webui/history2_ui.cc b/chrome/browser/ui/webui/history2_ui.cc
index 48cb4fa..cf6988b 100644
--- a/chrome/browser/ui/webui/history2_ui.cc
+++ b/chrome/browser/ui/webui/history2_ui.cc
@@ -33,8 +33,8 @@
#include "content/browser/tab_contents/tab_contents.h"
#include "content/browser/tab_contents/tab_contents_delegate.h"
#include "content/browser/user_metrics.h"
-#include "content/common/notification_details.h"
-#include "content/common/notification_source.h"
+#include "content/public/browser/notification_details.h"
+#include "content/public/browser/notification_source.h"
#include "grit/browser_resources.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
@@ -108,7 +108,7 @@ WebUIMessageHandler* BrowsingHistoryHandler2::Attach(WebUI* web_ui) {
// Get notifications when history is cleared.
registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
- Source<Profile>(profile->GetOriginalProfile()));
+ content::Source<Profile>(profile->GetOriginalProfile()));
return WebUIMessageHandler::Attach(web_ui);
}
@@ -362,15 +362,16 @@ history::QueryOptions BrowsingHistoryHandler2::CreateMonthQueryOptions(
return options;
}
-void BrowsingHistoryHandler2::Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
+void BrowsingHistoryHandler2::Observe(
+ int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
if (type != chrome::NOTIFICATION_HISTORY_URLS_DELETED) {
NOTREACHED();
return;
}
history::URLsDeletedDetails* deletedDetails =
- Details<history::URLsDeletedDetails>(details).ptr();
+ content::Details<history::URLsDeletedDetails>(details).ptr();
if (deletedDetails->urls != urls_to_be_deleted_) {
// Notify the page that someone else deleted from the history.
web_ui_->CallJavascriptFunction("historyDeleted");