| Index: chrome/browser/automation/automation_tab_tracker.cc
|
| ===================================================================
|
| --- chrome/browser/automation/automation_tab_tracker.cc (revision 116288)
|
| +++ chrome/browser/automation/automation_tab_tracker.cc (working copy)
|
| @@ -8,35 +8,35 @@
|
| #include "content/public/browser/navigation_controller.h"
|
| #include "content/public/browser/notification_source.h"
|
|
|
| +using content::NavigationController;
|
| +
|
| AutomationTabTracker::AutomationTabTracker(IPC::Message::Sender* automation)
|
| - : AutomationResourceTracker<content::NavigationController*>(automation) {
|
| + : AutomationResourceTracker<NavigationController*>(automation) {
|
| }
|
|
|
| AutomationTabTracker::~AutomationTabTracker() {
|
| }
|
|
|
| -void AutomationTabTracker::AddObserver(
|
| - content::NavigationController* resource) {
|
| +void AutomationTabTracker::AddObserver(NavigationController* resource) {
|
| // This tab could either be a regular tab or an external tab
|
| // Register for both notifications.
|
| registrar_.Add(this, content::NOTIFICATION_TAB_CLOSING,
|
| - content::Source<content::NavigationController>(resource));
|
| + content::Source<NavigationController>(resource));
|
| registrar_.Add(this, chrome::NOTIFICATION_EXTERNAL_TAB_CLOSED,
|
| - content::Source<content::NavigationController>(resource));
|
| + content::Source<NavigationController>(resource));
|
| // We also want to know about navigations so we can keep track of the last
|
| // navigation time.
|
| registrar_.Add(this, content::NOTIFICATION_LOAD_STOP,
|
| - content::Source<content::NavigationController>(resource));
|
| + content::Source<NavigationController>(resource));
|
| }
|
|
|
| -void AutomationTabTracker::RemoveObserver(
|
| - content::NavigationController* resource) {
|
| +void AutomationTabTracker::RemoveObserver(NavigationController* resource) {
|
| registrar_.Remove(this, content::NOTIFICATION_TAB_CLOSING,
|
| - content::Source<content::NavigationController>(resource));
|
| + content::Source<NavigationController>(resource));
|
| registrar_.Remove(this, chrome::NOTIFICATION_EXTERNAL_TAB_CLOSED,
|
| - content::Source<content::NavigationController>(resource));
|
| + content::Source<NavigationController>(resource));
|
| registrar_.Remove(this, content::NOTIFICATION_LOAD_STOP,
|
| - content::Source<content::NavigationController>(resource));
|
| + content::Source<NavigationController>(resource));
|
| }
|
|
|
| void AutomationTabTracker::Observe(
|
| @@ -46,15 +46,15 @@
|
| switch (type) {
|
| case content::NOTIFICATION_LOAD_STOP:
|
| last_navigation_times_[
|
| - content::Source<content::NavigationController>(source).ptr()] =
|
| + content::Source<NavigationController>(source).ptr()] =
|
| base::Time::Now();
|
| return;
|
| case chrome::NOTIFICATION_EXTERNAL_TAB_CLOSED:
|
| case content::NOTIFICATION_TAB_CLOSING:
|
| {
|
| - std::map<content::NavigationController*, base::Time>::iterator iter =
|
| + std::map<NavigationController*, base::Time>::iterator iter =
|
| last_navigation_times_.find(
|
| - content::Source<content::NavigationController>(source).ptr());
|
| + content::Source<NavigationController>(source).ptr());
|
| if (iter != last_navigation_times_.end())
|
| last_navigation_times_.erase(iter);
|
| }
|
| @@ -62,15 +62,15 @@
|
| default:
|
| NOTREACHED();
|
| }
|
| - AutomationResourceTracker<content::NavigationController*>::Observe(
|
| + AutomationResourceTracker<NavigationController*>::Observe(
|
| type, source, details);
|
| }
|
|
|
| base::Time AutomationTabTracker::GetLastNavigationTime(int handle) {
|
| if (ContainsHandle(handle)) {
|
| - content::NavigationController* controller = GetResource(handle);
|
| + NavigationController* controller = GetResource(handle);
|
| if (controller) {
|
| - std::map<content::NavigationController*, base::Time>::const_iterator iter
|
| + std::map<NavigationController*, base::Time>::const_iterator iter
|
| = last_navigation_times_.find(controller);
|
| if (iter != last_navigation_times_.end())
|
| return iter->second;
|
|
|