summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation/automation_provider_win.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-21 06:10:33 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-21 06:10:33 +0000
commitd370803d8ae64d08ecdf4d99942e97de77ce29af (patch)
tree5453b377e22bcc1da56e18484ef26661a0a27975 /chrome/browser/automation/automation_provider_win.cc
parent9e2c5763127d64bce27bfcb1e46c5ea438cd103a (diff)
downloadchromium_src-d370803d8ae64d08ecdf4d99942e97de77ce29af.zip
chromium_src-d370803d8ae64d08ecdf4d99942e97de77ce29af.tar.gz
chromium_src-d370803d8ae64d08ecdf4d99942e97de77ce29af.tar.bz2
browser: Add ExternalTabContainer interface.
This allow us to remove a dependency in chrome/browser/ui/views from automation. BUG=125846 R=ananta@chromium.org,robertshield@chromium.org TBR=ben@chromium.org NOTRY=true Review URL: https://chromiumcodereview.appspot.com/10536198 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/automation_provider_win.cc')
-rw-r--r--chrome/browser/automation/automation_provider_win.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc
index 8c1c11b..13885c6 100644
--- a/chrome/browser/automation/automation_provider_win.cc
+++ b/chrome/browser/automation/automation_provider_win.cc
@@ -12,7 +12,7 @@
#include "chrome/browser/automation/automation_browser_tracker.h"
#include "chrome/browser/automation/automation_tab_tracker.h"
#include "chrome/browser/automation/automation_window_tracker.h"
-#include "chrome/browser/external_tab/external_tab_container_win.h"
+#include "chrome/browser/external_tab/external_tab_container.h"
#include "chrome/browser/printing/print_view_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/restore_tab_helper.h"
@@ -177,7 +177,7 @@ void AutomationProvider::CreateExternalTab(
*tab_window = NULL;
*session_id = -1;
scoped_refptr<ExternalTabContainer> external_tab_container =
- new ExternalTabContainer(this, automation_resource_message_filter_);
+ ExternalTabContainer::Create(this, automation_resource_message_filter_);
Profile* profile = settings.is_incognito ?
profile_->GetOffTheRecordProfile() : profile_;
@@ -191,11 +191,11 @@ void AutomationProvider::CreateExternalTab(
settings.route_all_top_level_navigations);
if (AddExternalTab(external_tab_container)) {
- WebContents* web_contents = external_tab_container->web_contents();
- *tab_handle = external_tab_container->tab_handle();
- *tab_container_window = external_tab_container->GetNativeView();
+ WebContents* web_contents = external_tab_container->GetWebContents();
+ *tab_handle = external_tab_container->GetTabHandle();
+ *tab_container_window = external_tab_container->GetExternalTabNativeView();
*tab_window = web_contents->GetNativeView();
- *session_id = external_tab_container->tab_contents()->
+ *session_id = external_tab_container->GetTabContents()->
restore_tab_helper()->session_id().id();
} else {
external_tab_container->Uninitialize();
@@ -207,7 +207,7 @@ void AutomationProvider::CreateExternalTab(
bool AutomationProvider::AddExternalTab(ExternalTabContainer* external_tab) {
DCHECK(external_tab != NULL);
- WebContents* web_contents = external_tab->web_contents();
+ WebContents* web_contents = external_tab->GetWebContents();
if (web_contents) {
int tab_handle = tab_tracker_->Add(&web_contents->GetController());
external_tab->SetTabHandle(tab_handle);
@@ -330,11 +330,11 @@ void AutomationProvider::ConnectExternalTab(
external_tab_container->Reinitialize(this,
automation_resource_message_filter_,
parent_window);
- WebContents* tab_contents = external_tab_container->web_contents();
- *tab_handle = external_tab_container->tab_handle();
- *tab_container_window = external_tab_container->GetNativeView();
+ WebContents* tab_contents = external_tab_container->GetWebContents();
+ *tab_handle = external_tab_container->GetTabHandle();
+ *tab_container_window = external_tab_container->GetExternalTabNativeView();
*tab_window = tab_contents->GetNativeView();
- *session_id = external_tab_container->tab_contents()->
+ *session_id = external_tab_container->GetTabContents()->
restore_tab_helper()->session_id().id();
} else {
external_tab_container->Uninitialize();