summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-01 05:44:17 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-01 05:44:17 +0000
commit9b7779b1a7559e4af1720408beb6e0b931e8435a (patch)
treee4fff86e87bcf539edcda3c3f73175a1d97e09ea /webkit/tools
parent00c4079ca3b6753db530bc8c5522793f25aa6619 (diff)
downloadchromium_src-9b7779b1a7559e4af1720408beb6e0b931e8435a.zip
chromium_src-9b7779b1a7559e4af1720408beb6e0b931e8435a.tar.gz
chromium_src-9b7779b1a7559e4af1720408beb6e0b931e8435a.tar.bz2
Move various methods from glue/webview.h to api/public/WebView.h
I'll re-order the methods in webview_impl.cc in a follow-up CL. I wanted to keep this one easy to review. SetBackForwardListSize is no longer necessary given that BackForwardListChromium.cpp doesn't care about its capacity. R=dglazkov BUG=10033 TEST=none Review URL: http://codereview.chromium.org/251051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/layout_test_controller.cc4
-rw-r--r--webkit/tools/test_shell/mac/test_shell_webview.mm2
-rw-r--r--webkit/tools/test_shell/mac/webview_host.mm2
-rw-r--r--webkit/tools/test_shell/test_shell_gtk.cc4
-rw-r--r--webkit/tools/test_shell/test_shell_mac.mm2
-rw-r--r--webkit/tools/test_shell/test_shell_win.cc4
-rw-r--r--webkit/tools/test_shell/webview_host_gtk.cc2
-rw-r--r--webkit/tools/test_shell/webview_host_win.cc2
8 files changed, 11 insertions, 11 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index bc88eb5..a57a383 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -414,7 +414,7 @@ void LayoutTestController::objCIdentityIsEqual(
void LayoutTestController::Reset() {
if (shell_) {
shell_->webView()->zoomDefault();
- shell_->webView()->SetTabKeyCyclesThroughElements(true);
+ shell_->webView()->setTabKeyCyclesThroughElements(true);
}
dump_as_text_ = false;
dump_editing_callbacks_ = false;
@@ -486,7 +486,7 @@ void LayoutTestController::setCanOpenWindows(
void LayoutTestController::setTabKeyCyclesThroughElements(
const CppArgumentList& args, CppVariant* result) {
if (args.size() > 0 && args[0].isBool()) {
- shell_->webView()->SetTabKeyCyclesThroughElements(args[0].ToBoolean());
+ shell_->webView()->setTabKeyCyclesThroughElements(args[0].ToBoolean());
}
result->SetNull();
}
diff --git a/webkit/tools/test_shell/mac/test_shell_webview.mm b/webkit/tools/test_shell/mac/test_shell_webview.mm
index 31d5c0a..908abde 100644
--- a/webkit/tools/test_shell/mac/test_shell_webview.mm
+++ b/webkit/tools/test_shell/mac/test_shell_webview.mm
@@ -76,7 +76,7 @@
- (IBAction)stopLoading:(id)sender {
if (shell_ && shell_->webView())
- shell_->webView()->StopLoading();
+ shell_->webView()->mainFrame()->stopLoading();
}
- (IBAction)takeURLStringValueFrom:(NSTextField *)sender {
diff --git a/webkit/tools/test_shell/mac/webview_host.mm b/webkit/tools/test_shell/mac/webview_host.mm
index b27a603..9f267a9 100644
--- a/webkit/tools/test_shell/mac/webview_host.mm
+++ b/webkit/tools/test_shell/mac/webview_host.mm
@@ -37,7 +37,7 @@ WebViewHost* WebViewHost::Create(NSView* parent_view,
host->webwidget_ = WebView::Create(delegate);
prefs.Apply(host->webview());
- host->webview()->InitializeMainFrame(delegate);
+ host->webview()->initializeMainFrame(delegate);
host->webwidget_->resize(WebSize(content_rect.size.width,
content_rect.size.height));
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index c9319ab..16661d8 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -88,7 +88,7 @@ void ForwardButtonClicked(GtkButton* button, TestShell* shell) {
// Callback for when you click the stop button.
void StopButtonClicked(GtkButton* button, TestShell* shell) {
- shell->webView()->StopLoading();
+ shell->webView()->mainFrame()->stopLoading();
}
// Callback for when you click the reload button.
@@ -534,7 +534,7 @@ void TestShell::ResizeSubViews() {
shell->m_focusedWidgetHost = NULL;
// Make sure the previous load is stopped.
- shell->webView()->StopLoading();
+ shell->webView()->mainFrame()->stopLoading();
shell->navigation_controller()->Reset();
// Clean up state between test runs.
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 54f2a65..7ac40c0 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -514,7 +514,7 @@ void TestShell::ResizeSubViews() {
shell->m_focusedWidgetHost = NULL;
// Make sure the previous load is stopped.
- shell->webView()->StopLoading();
+ shell->webView()->mainFrame()->stopLoading();
shell->navigation_controller()->Reset();
// Clean up state between test runs.
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index f231ba0..7d2cf88 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -238,7 +238,7 @@ bool TestShell::RunFileTest(const TestParams& params) {
shell->m_focusedWidgetHost = NULL;
// Make sure the previous load is stopped.
- shell->webView()->StopLoading();
+ shell->webView()->mainFrame()->stopLoading();
shell->navigation_controller()->Reset();
// StopLoading may update state maintained in the test controller (for
@@ -547,7 +547,7 @@ LRESULT CALLBACK TestShell::WndProc(HWND hwnd, UINT message, WPARAM wParam,
if (wmId == IDC_NAV_RELOAD) {
shell->Reload();
} else {
- shell->webView()->StopLoading();
+ shell->webView()->mainFrame()->stopLoading();
}
}
break;
diff --git a/webkit/tools/test_shell/webview_host_gtk.cc b/webkit/tools/test_shell/webview_host_gtk.cc
index 21f982f..88f5a91 100644
--- a/webkit/tools/test_shell/webview_host_gtk.cc
+++ b/webkit/tools/test_shell/webview_host_gtk.cc
@@ -26,7 +26,7 @@ WebViewHost* WebViewHost::Create(GtkWidget* parent_view,
host->webwidget_ = WebView::Create(delegate);
prefs.Apply(host->webview());
- host->webview()->InitializeMainFrame(delegate);
+ host->webview()->initializeMainFrame(delegate);
host->webwidget_->layout();
return host;
diff --git a/webkit/tools/test_shell/webview_host_win.cc b/webkit/tools/test_shell/webview_host_win.cc
index 864f4d5..81ee86e 100644
--- a/webkit/tools/test_shell/webview_host_win.cc
+++ b/webkit/tools/test_shell/webview_host_win.cc
@@ -41,7 +41,7 @@ WebViewHost* WebViewHost::Create(HWND parent_view,
host->webwidget_ = WebView::Create(delegate);
prefs.Apply(host->webview());
- host->webview()->InitializeMainFrame(delegate);
+ host->webview()->initializeMainFrame(delegate);
return host;
}