Change window_handle() to view_handle(). When disambiguating HWNDs, this was turned into a ViewHandle but the name was never changed. This has been distracting me forever.

Review URL: http://codereview.chromium.org/11528

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5783 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 20 insertions, 20 deletions

diff --git a/webkit/tools/test_shell/mac/test_webview_delegate.mm b/webkit/tools/test_shell/mac/test_webview_delegate.mm
index be4da38..7373cb6 100644
--- a/webkit/tools/test_shell/mac/test_webview_delegate.mm
+++ b/webkit/tools/test_shell/mac/test_webview_delegate.mm
@@ -70,7 +70,7 @@ void TestWebViewDelegate::GetWindowRect(WebWidget* webwidget,
                                         gfx::Rect* out_rect) {
   DCHECK(out_rect);
   if (WebWidgetHost* host = GetHostForWidget(webwidget)) {
-    NSView *view = host->window_handle();
+    NSView *view = host->view_handle();
     NSRect rect = [view frame];
     *out_rect = gfx::Rect(NSRectToCGRect(rect));
   }
@@ -90,7 +90,7 @@ void TestWebViewDelegate::SetWindowRect(WebWidget* webwidget,
 void TestWebViewDelegate::GetRootWindowRect(WebWidget* webwidget,
                                             gfx::Rect* out_rect) {
   if (WebWidgetHost* host = GetHostForWidget(webwidget)) {
-    NSView *view = host->window_handle();
+    NSView *view = host->view_handle();
     NSRect rect = [[[view window] contentView] frame];
     *out_rect = gfx::Rect(NSRectToCGRect(rect));
   }
@@ -103,7 +103,7 @@ void TestWebViewDelegate::RunModal(WebWidget* webwidget) {
 // Private methods -----------------------------------------------------------
 
 void TestWebViewDelegate::SetPageTitle(const std::wstring& title) {
-  [[shell_->webViewHost()->window_handle() window]
+  [[shell_->webViewHost()->view_handle() window]
       setTitle:[NSString stringWithUTF8String:WideToUTF8(title).c_str()]];
 }
 
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h
index 7ce104f..62ca208 100644
--- a/webkit/tools/test_shell/test_shell.h
+++ b/webkit/tools/test_shell/test_shell.h
@@ -156,9 +156,9 @@ public:
     void DumpRenderTree();
 
     gfx::WindowHandle mainWnd() const { return m_mainWnd; }
-    gfx::ViewHandle webViewWnd() const { return m_webViewHost->window_handle(); }
+    gfx::ViewHandle webViewWnd() const { return m_webViewHost->view_handle(); }
     gfx::EditViewHandle editWnd() const { return m_editWnd; }
-    gfx::ViewHandle popupWnd() const { return m_popupHost->window_handle(); }
+    gfx::ViewHandle popupWnd() const { return m_popupHost->view_handle(); }
 
     static WindowList* windowList() { return window_list_; }
 
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index 22cac45..77c407c 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -274,7 +274,7 @@ void TestShell::WaitTestFinished() {
 }
 
 void TestShell::InteractiveSetFocus(WebWidgetHost* host, bool enable) {
-  GtkWidget* widget = GTK_WIDGET(host->window_handle());
+  GtkWidget* widget = GTK_WIDGET(host->view_handle());
 
   if (enable) {
     gtk_widget_grab_focus(widget);
@@ -302,7 +302,7 @@ WebWidget* TestShell::CreatePopupWidget(WebView* webview) {
 
 void TestShell::ClosePopup() {
   DCHECK(m_popupHost);
-  GtkWidget* drawing_area = m_popupHost->window_handle();
+  GtkWidget* drawing_area = m_popupHost->view_handle();
   GtkWidget* window =
       gtk_widget_get_parent(gtk_widget_get_parent(drawing_area));
   gtk_widget_destroy(window);
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index abc82cc..92cea42 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -184,7 +184,7 @@ bool TestShell::Initialize(const std::wstring& startingURL) {
   webView()->SetUseEditorDelegate(true);
   delegate_->RegisterDragDrop();
   TestShellWebView* web_view = 
-      static_cast<TestShellWebView*>(m_webViewHost->window_handle());
+      static_cast<TestShellWebView*>(m_webViewHost->view_handle());
   [web_view setShell:this];
   
   // create buttons
@@ -342,8 +342,8 @@ void TestShell::WaitTestFinished() {
 void TestShell::InteractiveSetFocus(WebWidgetHost* host, bool enable) {
 #if 0
   if (enable)
-    ::SetFocus(host->window_handle());
-  else if (::GetFocus() == host->window_handle())
+    ::SetFocus(host->view_handle());
+  else if (::GetFocus() == host->view_handle())
     ::SetFocus(NULL);
 #endif
 }
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 7ed8f1f..840b919 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -486,8 +486,8 @@ void TestShell::WaitTestFinished() {
 
 void TestShell::InteractiveSetFocus(WebWidgetHost* host, bool enable) {
   if (enable)
-    ::SetFocus(host->window_handle());
-  else if (::GetFocus() == host->window_handle())
+    ::SetFocus(host->view_handle());
+  else if (::GetFocus() == host->view_handle())
     ::SetFocus(NULL);
 }
 
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index d3d4e0d..e9d60e2 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -613,7 +613,7 @@ void TestWebViewDelegate::SetUserStyleSheetLocation(const GURL& location) {
 
 gfx::ViewHandle TestWebViewDelegate::GetContainingWindow(WebWidget* webwidget) {
   if (WebWidgetHost* host = GetHostForWidget(webwidget))
-    return host->window_handle();
+    return host->view_handle();
 
   return NULL;
 }
diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
index d9c5a81..bbd586b 100644
--- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
@@ -54,7 +54,7 @@ void TestWebViewDelegate::ShowJavaScriptAlert(const std::wstring& message) {
 void TestWebViewDelegate::Show(WebWidget* webwidget,
                                WindowOpenDisposition disposition) {
   WebWidgetHost* host = GetHostForWidget(webwidget);
-  GtkWidget* drawing_area = host->window_handle();
+  GtkWidget* drawing_area = host->view_handle();
   GtkWidget* window =
       gtk_widget_get_parent(gtk_widget_get_parent(drawing_area));
   gtk_widget_show_all(window);
@@ -96,7 +96,7 @@ void TestWebViewDelegate::GetWindowRect(WebWidget* webwidget,
                                         gfx::Rect* out_rect) {
   DCHECK(out_rect);
   WebWidgetHost* host = GetHostForWidget(webwidget);
-  GtkWidget* drawing_area = host->window_handle();
+  GtkWidget* drawing_area = host->view_handle();
   GtkWidget* vbox = gtk_widget_get_parent(drawing_area);
   GtkWidget* window = gtk_widget_get_parent(vbox);
 
@@ -115,7 +115,7 @@ void TestWebViewDelegate::SetWindowRect(WebWidget* webwidget,
     // ignored
   } else if (webwidget == shell_->popup()) {
     WebWidgetHost* host = GetHostForWidget(webwidget);
-    GtkWidget* drawing_area = host->window_handle();
+    GtkWidget* drawing_area = host->view_handle();
     GtkWidget* window =
         gtk_widget_get_parent(gtk_widget_get_parent(drawing_area));
     gtk_window_resize(GTK_WINDOW(window), rect.width(), rect.height());
@@ -130,7 +130,7 @@ void TestWebViewDelegate::GetRootWindowRect(WebWidget* webwidget,
     // window.  This means the x/y is the distance from the corner of the
     // screen, and the width/height is the size of the entire browser window.
     // For example, this is used to implement window.screenX and window.screenY.
-    GtkWidget* drawing_area = host->window_handle();
+    GtkWidget* drawing_area = host->view_handle();
     GtkWidget* window =
         gtk_widget_get_parent(gtk_widget_get_parent(drawing_area));
     gint x, y, width, height;
diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc
index 0a06d6c6..9826488 100644
--- a/webkit/tools/test_shell/test_webview_delegate_win.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_win.cc
@@ -106,7 +106,7 @@ void TestWebViewDelegate::GetWindowRect(WebWidget* webwidget,
                                         gfx::Rect* out_rect) {
   if (WebWidgetHost* host = GetHostForWidget(webwidget)) {
     RECT rect;
-    ::GetWindowRect(host->window_handle(), &rect);
+    ::GetWindowRect(host->view_handle(), &rect);
     *out_rect = gfx::Rect(rect);
   }
 }
@@ -125,7 +125,7 @@ void TestWebViewDelegate::GetRootWindowRect(WebWidget* webwidget,
                                             gfx::Rect* out_rect) {
   if (WebWidgetHost* host = GetHostForWidget(webwidget)) {
     RECT rect;
-    HWND root_window = ::GetAncestor(host->window_handle(), GA_ROOT);
+    HWND root_window = ::GetAncestor(host->view_handle(), GA_ROOT);
     ::GetWindowRect(root_window, &rect);
     *out_rect = gfx::Rect(rect);
   }
diff --git a/webkit/tools/test_shell/webwidget_host.h b/webkit/tools/test_shell/webwidget_host.h
index 3bb7b5c..3cb400a 100644
--- a/webkit/tools/test_shell/webwidget_host.h
+++ b/webkit/tools/test_shell/webwidget_host.h
@@ -32,7 +32,7 @@ class WebWidgetHost {
   static void HandleEvent(gfx::WindowHandle window, NSEvent *event);
 #endif
 
-  gfx::ViewHandle window_handle() const { return view_; }
+  gfx::ViewHandle view_handle() const { return view_; }
   WebWidget* webwidget() const { return webwidget_; }
 
   void DidInvalidateRect(const gfx::Rect& rect);