summaryrefslogtreecommitdiffstats
path: root/ui/aura/window_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ui/aura/window_unittest.cc')
-rw-r--r--ui/aura/window_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index 2c51f71..fe965a2 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -887,7 +887,7 @@ class WindowObserverTest : public WindowTest,
}
// Return a string representation of the arguments passed in
- // OnPropertyChanged callback.
+ // OnWindowPropertyChanged callback.
std::string PropertyChangeInfoAndClear() {
std::string result(
base::StringPrintf("name=%s old=%ld new=%ld",
@@ -920,9 +920,9 @@ class WindowObserverTest : public WindowTest,
destroyed_count_++;
}
- virtual void OnPropertyChanged(Window* window,
- const char* name,
- void* old) OVERRIDE {
+ virtual void OnWindowPropertyChanged(Window* window,
+ const char* name,
+ void* old) OVERRIDE {
property_name_ = std::string(name);
old_property_value_ = reinterpret_cast<intptr_t>(old);
new_property_value_ = reinterpret_cast<intptr_t>(window->GetProperty(name));