Renamed BrowserWindow::GetNativeHandle() to GetNativeWindow()

This is in preparation for adding a GetNativeWindow() method to
the BaseWindow interface.

BUG=None
TEST=None

Review URL: https://chromiumcodereview.appspot.com/10538039

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

3 files changed, 6 insertions, 6 deletions

diff --git a/ui/gl/android_native_window.cc b/ui/gl/android_native_window.cc
index f75b753..4576f63 100644
--- a/ui/gl/android_native_window.cc
+++ b/ui/gl/android_native_window.cc
@@ -19,7 +19,7 @@ AndroidNativeWindow::~AndroidNativeWindow() {
     ANativeWindow_release(window_);
 }
 
-ANativeWindow* AndroidNativeWindow::GetNativeHandle() const {
+ANativeWindow* AndroidNativeWindow::GetNativeWindow() const {
   return window_;
 }
 
diff --git a/ui/gl/android_native_window.h b/ui/gl/android_native_window.h
index bde5904..e6e899f 100644
--- a/ui/gl/android_native_window.h
+++ b/ui/gl/android_native_window.h
@@ -19,7 +19,7 @@ class AndroidNativeWindow {
   explicit AndroidNativeWindow(ANativeWindow* window);
   ~AndroidNativeWindow();
 
-  ANativeWindow* GetNativeHandle() const;
+  ANativeWindow* GetNativeWindow() const;
 
  private:
   ANativeWindow* window_;
diff --git a/ui/gl/gl_surface_android.cc b/ui/gl/gl_surface_android.cc
index 5500ba0..ebd88ca 100644
--- a/ui/gl/gl_surface_android.cc
+++ b/ui/gl/gl_surface_android.cc
@@ -127,7 +127,7 @@ bool AndroidViewSurface::Resize(const gfx::Size& size) {
   if (pbuffer_surface_.get())
     return pbuffer_surface_->Resize(size);
   else if (GetHandle()) {
-    DCHECK(window_ && window_->GetNativeHandle());
+    DCHECK(window_ && window_->GetNativeWindow());
     // Deactivate and restore any currently active context.
     EGLContext context = eglGetCurrentContext();
     if (context != EGL_NO_CONTEXT) {
@@ -144,11 +144,11 @@ bool AndroidViewSurface::Resize(const gfx::Size& size) {
 }
 
 bool AndroidViewSurface::CreateWindowSurface(AndroidNativeWindow* window) {
-  DCHECK(window->GetNativeHandle());
+  DCHECK(window->GetNativeWindow());
   window_ = window;
   EGLSurface surface = eglCreateWindowSurface(GetDisplay(),
                                               GetConfig(),
-                                              window->GetNativeHandle(),
+                                              window->GetNativeWindow(),
                                               NULL);
   if (surface == EGL_NO_SURFACE) {
     LOG(ERROR) << "eglCreateWindowSurface failed with error "
@@ -162,7 +162,7 @@ bool AndroidViewSurface::CreateWindowSurface(AndroidNativeWindow* window) {
 }
 
 void AndroidViewSurface::SetNativeWindow(AndroidNativeWindow* window) {
-  if (window->GetNativeHandle()) {
+  if (window->GetNativeWindow()) {
     DCHECK(pbuffer_surface_.get());
     pbuffer_surface_->Destroy();
     pbuffer_surface_ = NULL;