Rename WindowTreeHostPlatform::window_ to ::platform_window_

ui/aura/window_tree_host_platform.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/window_tree_host_platform.h"
 
 #include <utility>
 
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
@@ skipping 24 matching lines @@
 // static
 WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds) {
   return new WindowTreeHostPlatform(bounds);
 }
 #endif
 
 WindowTreeHostPlatform::WindowTreeHostPlatform(const gfx::Rect& bounds)
     : WindowTreeHostPlatform() {
   CreateCompositor();
 #if defined(USE_OZONE)
-  window_ =
+  platform_window_ =
       ui::OzonePlatform::GetInstance()->CreatePlatformWindow(this, bounds);
 #elif defined(OS_WIN)
-  window_.reset(new ui::WinWindow(this, bounds));
+  platform_window_.reset(new ui::WinWindow(this, bounds));
 #elif defined(OS_ANDROID)
-  window_.reset(new ui::PlatformWindowAndroid(this));
+  platform_window_.reset(new ui::PlatformWindowAndroid(this));
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 WindowTreeHostPlatform::WindowTreeHostPlatform()
     : WindowTreeHostPlatform(nullptr) {}
 
 WindowTreeHostPlatform::WindowTreeHostPlatform(
     std::unique_ptr<WindowPort> window_port)
     : WindowTreeHost(std::move(window_port)),
       widget_(gfx::kNullAcceleratedWidget),
       current_cursor_(ui::kCursorNull) {
 }
 
 void WindowTreeHostPlatform::SetPlatformWindow(
     std::unique_ptr<ui::PlatformWindow> window) {
-  window_ = std::move(window);
+  platform_window_ = std::move(window);
 }
 
 WindowTreeHostPlatform::~WindowTreeHostPlatform() {
   DestroyCompositor();
   DestroyDispatcher();
-  window_->Close();
+  platform_window_->Close();
 }
 
 ui::EventSource* WindowTreeHostPlatform::GetEventSource() {
   return this;
 }
 
 gfx::AcceleratedWidget WindowTreeHostPlatform::GetAcceleratedWidget() {
   return widget_;
 }
 
 void WindowTreeHostPlatform::ShowImpl() {
-  window_->Show();
+  platform_window_->Show();
 }
 
 void WindowTreeHostPlatform::HideImpl() {
-  window_->Hide();
+  platform_window_->Hide();
 }
 
 gfx::Rect WindowTreeHostPlatform::GetBoundsInPixels() const {
-  return window_ ? window_->GetBounds() : gfx::Rect();
+  return platform_window_ ? platform_window_->GetBounds() : gfx::Rect();
 }
 
 void WindowTreeHostPlatform::SetBoundsInPixels(const gfx::Rect& bounds) {
-  window_->SetBounds(bounds);
+  platform_window_->SetBounds(bounds);
 }
 
 gfx::Point WindowTreeHostPlatform::GetLocationOnScreenInPixels() const {
-  return window_->GetBounds().origin();
+  return platform_window_->GetBounds().origin();
 }
 
 void WindowTreeHostPlatform::SetCapture() {
-  window_->SetCapture();
+  platform_window_->SetCapture();
 }
 
 void WindowTreeHostPlatform::ReleaseCapture() {
-  window_->ReleaseCapture();
+  platform_window_->ReleaseCapture();
 }
 
 void WindowTreeHostPlatform::SetCursorNative(gfx::NativeCursor cursor) {
   if (cursor == current_cursor_)
     return;
   current_cursor_ = cursor;
 
 #if defined(OS_WIN)
   ui::CursorLoaderWin cursor_loader;
   cursor_loader.SetPlatformCursor(&cursor);
 #endif
 
-  window_->SetCursor(cursor.platform());
+  platform_window_->SetCursor(cursor.platform());
 }
 
 void WindowTreeHostPlatform::MoveCursorToScreenLocationInPixels(
     const gfx::Point& location_in_pixels) {
-  window_->MoveCursorTo(location_in_pixels);
+  platform_window_->MoveCursorTo(location_in_pixels);
 }
 
 void WindowTreeHostPlatform::OnCursorVisibilityChangedNative(bool show) {
   NOTIMPLEMENTED();
 }
 
 void WindowTreeHostPlatform::OnBoundsChanged(const gfx::Rect& new_bounds) {
   float current_scale = compositor()->device_scale_factor();
   float new_scale = display::Screen::GetScreen()
                         ->GetDisplayNearestWindow(window())
@@ skipping 49 matching lines @@
   DCHECK_EQ(widget, widget_);
   widget_ = gfx::kNullAcceleratedWidget;
 }
 
 void WindowTreeHostPlatform::OnActivationChanged(bool active) {
   if (active)
     OnHostActivated();
 }
 
 }  // namespace aura