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

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

Issue 12334073: Remove WebContents methods that duplicate WebContentsView methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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_provider_win.cc
diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc
index eaed51e837abae64e042fec36c94615471076b2a..358ad6fba479422ed5022fbd8590ff7e5f9bb6e1 100644
--- a/chrome/browser/automation/automation_provider_win.cc
+++ b/chrome/browser/automation/automation_provider_win.cc
@@ -24,6 +24,7 @@
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
#include "content/public/common/page_zoom.h"
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/views/focus/accelerator_handler.h"
@@ -63,7 +64,7 @@ void AutomationProvider::CreateExternalTab(
SessionTabHelper::FromWebContents(web_contents);
*tab_handle = external_tab_container->GetTabHandle();
*tab_container_window = external_tab_container->GetExternalTabNativeView();
- *tab_window = web_contents->GetNativeView();
+ *tab_window = web_contents->GetView()->GetNativeView();
*session_id = session_tab_helper->session_id().id();
} else {
external_tab_container->Uninitialize();
@@ -118,7 +119,7 @@ ExternalTabContainer* AutomationProvider::GetExternalTabForHandle(int handle) {
if (tab_tracker_->ContainsHandle(handle)) {
NavigationController* tab = tab_tracker_->GetResource(handle);
return ExternalTabContainer::GetContainerForTab(
- tab->GetWebContents()->GetNativeView());
+ tab->GetWebContents()->GetView()->GetNativeView());
}
return NULL;
@@ -191,7 +192,7 @@ void AutomationProvider::ConnectExternalTab(
SessionTabHelper::FromWebContents(web_contents);
*tab_handle = external_tab_container->GetTabHandle();
*tab_container_window = external_tab_container->GetExternalTabNativeView();
- *tab_window = web_contents->GetNativeView();
+ *tab_window = web_contents->GetView()->GetNativeView();
*session_id = session_tab_helper->session_id().id();
} else {
external_tab_container->Uninitialize();
« no previous file with comments | « chrome/browser/autofill/risk/fingerprint_browsertest.cc ('k') | chrome/browser/chromeos/login/webui_login_display_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698