Index: chrome/browser/automation/automation_provider.cc |
=================================================================== |
--- chrome/browser/automation/automation_provider.cc (revision 116288) |
+++ chrome/browser/automation/automation_provider.cc (working copy) |
@@ -104,6 +104,7 @@ |
using base::Time; |
using content::BrowserThread; |
using content::DownloadItem; |
+using content::NavigationController; |
using content::WebContents; |
namespace { |
@@ -291,19 +292,18 @@ |
Send(new AutomationMsg_InitialLoadsComplete()); |
} |
-void AutomationProvider::AddLoginHandler(content::NavigationController* tab, |
+void AutomationProvider::AddLoginHandler(NavigationController* tab, |
LoginHandler* handler) { |
login_handler_map_[tab] = handler; |
} |
-void AutomationProvider::RemoveLoginHandler(content::NavigationController* tab) { |
+void AutomationProvider::RemoveLoginHandler(NavigationController* tab) { |
DCHECK(login_handler_map_[tab]); |
login_handler_map_.erase(tab); |
} |
int AutomationProvider::GetIndexForNavigationController( |
- const content::NavigationController* controller, |
- const Browser* parent) const { |
+ const NavigationController* controller, const Browser* parent) const { |
DCHECK(parent); |
return parent->GetIndexOfController(controller); |
} |
@@ -527,7 +527,7 @@ |
} |
Browser* AutomationProvider::FindAndActivateTab( |
- content::NavigationController* controller) { |
+ NavigationController* controller) { |
int tab_index; |
Browser* browser = Browser::GetBrowserForController(controller, &tab_index); |
if (browser) |
@@ -546,7 +546,7 @@ |
return; |
} |
- content::NavigationController* nav = tab_tracker_->GetResource(handle); |
+ NavigationController* nav = tab_tracker_->GetResource(handle); |
WebContents* web_contents = nav->GetWebContents(); |
SendFindRequest(web_contents, |
@@ -601,10 +601,9 @@ |
} |
WebContents* AutomationProvider::GetWebContentsForHandle( |
- int handle, content::NavigationController** tab) { |
+ int handle, NavigationController** tab) { |
if (tab_tracker_->ContainsHandle(handle)) { |
- content::NavigationController* nav_controller = |
- tab_tracker_->GetResource(handle); |
+ NavigationController* nav_controller = tab_tracker_->GetResource(handle); |
if (tab) |
*tab = nav_controller; |
return nav_controller->GetWebContents(); |
@@ -618,7 +617,7 @@ |
bool* success) { |
*success = false; |
if (tab_tracker_->ContainsHandle(tab_handle)) { |
- content::NavigationController* nav = tab_tracker_->GetResource(tab_handle); |
+ NavigationController* nav = tab_tracker_->GetResource(tab_handle); |
if (!nav) |
return; |
Browser* browser = FindAndActivateTab(nav); |
@@ -690,7 +689,7 @@ |
void AutomationProvider::ReloadAsync(int tab_handle) { |
if (tab_tracker_->ContainsHandle(tab_handle)) { |
- content::NavigationController* tab = tab_tracker_->GetResource(tab_handle); |
+ NavigationController* tab = tab_tracker_->GetResource(tab_handle); |
if (!tab) { |
NOTREACHED(); |
return; |
@@ -726,7 +725,7 @@ |
} |
if (tab_tracker_->ContainsHandle(tab_handle)) { |
- content::NavigationController* tab = tab_tracker_->GetResource(tab_handle); |
+ NavigationController* tab = tab_tracker_->GetResource(tab_handle); |
DCHECK(tab != NULL); |
if (tab && tab->GetWebContents()) { |
DCHECK(tab->GetWebContents()->GetBrowserContext() != NULL); |
@@ -797,7 +796,7 @@ |
RenderViewHost* AutomationProvider::GetViewForTab(int tab_handle) { |
if (tab_tracker_->ContainsHandle(tab_handle)) { |
- content::NavigationController* tab = tab_tracker_->GetResource(tab_handle); |
+ NavigationController* tab = tab_tracker_->GetResource(tab_handle); |
if (!tab) { |
NOTREACHED(); |
return NULL; |
@@ -1005,7 +1004,7 @@ |
} |
void AutomationProvider::SaveAsAsync(int tab_handle) { |
- content::NavigationController* tab = NULL; |
+ NavigationController* tab = NULL; |
WebContents* web_contents = GetWebContentsForHandle(tab_handle, &tab); |
if (web_contents) |
web_contents->OnSavePage(); |