Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4060)

Unified Diff: chrome/browser/automation/automation_tab_tracker.cc

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/automation/automation_tab_tracker.cc
===================================================================
--- chrome/browser/automation/automation_tab_tracker.cc (revision 91968)
+++ chrome/browser/automation/automation_tab_tracker.cc (working copy)
@@ -5,8 +5,8 @@
#include "chrome/browser/automation/automation_tab_tracker.h"
#include "content/browser/tab_contents/navigation_controller.h"
+#include "chrome/common/chrome_notification_types.h"
#include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
AutomationTabTracker::AutomationTabTracker(IPC::Message::Sender* automation)
: AutomationResourceTracker<NavigationController*>(automation) {
@@ -18,35 +18,35 @@
void AutomationTabTracker::AddObserver(NavigationController* resource) {
// This tab could either be a regular tab or an external tab
// Register for both notifications.
- registrar_.Add(this, NotificationType::TAB_CLOSING,
+ registrar_.Add(this, content::NOTIFICATION_TAB_CLOSING,
Source<NavigationController>(resource));
- registrar_.Add(this, NotificationType::EXTERNAL_TAB_CLOSED,
+ registrar_.Add(this, chrome::NOTIFICATION_EXTERNAL_TAB_CLOSED,
Source<NavigationController>(resource));
// We also want to know about navigations so we can keep track of the last
// navigation time.
- registrar_.Add(this, NotificationType::LOAD_STOP,
+ registrar_.Add(this, content::NOTIFICATION_LOAD_STOP,
Source<NavigationController>(resource));
}
void AutomationTabTracker::RemoveObserver(NavigationController* resource) {
- registrar_.Remove(this, NotificationType::TAB_CLOSING,
+ registrar_.Remove(this, content::NOTIFICATION_TAB_CLOSING,
Source<NavigationController>(resource));
- registrar_.Remove(this, NotificationType::EXTERNAL_TAB_CLOSED,
+ registrar_.Remove(this, chrome::NOTIFICATION_EXTERNAL_TAB_CLOSED,
Source<NavigationController>(resource));
- registrar_.Remove(this, NotificationType::LOAD_STOP,
+ registrar_.Remove(this, content::NOTIFICATION_LOAD_STOP,
Source<NavigationController>(resource));
}
-void AutomationTabTracker::Observe(NotificationType type,
+void AutomationTabTracker::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
- switch (type.value) {
- case NotificationType::LOAD_STOP:
+ switch (type) {
+ case content::NOTIFICATION_LOAD_STOP:
last_navigation_times_[Source<NavigationController>(source).ptr()] =
base::Time::Now();
return;
- case NotificationType::EXTERNAL_TAB_CLOSED:
- case NotificationType::TAB_CLOSING:
+ case chrome::NOTIFICATION_EXTERNAL_TAB_CLOSED:
+ case content::NOTIFICATION_TAB_CLOSING:
{
std::map<NavigationController*, base::Time>::iterator iter =
last_navigation_times_.find(
« no previous file with comments | « chrome/browser/automation/automation_tab_tracker.h ('k') | chrome/browser/automation/automation_window_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698