Use aura::WindowProperty for title and name strings.

ui/aura/window.cc

 // Copyright (c) 2012 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.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/event_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/client/visibility_client.h"
 #include "ui/aura/client/window_stacking_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window_delegate.h"
@@ skipping 120 matching lines @@
   layer()->SetFillsBoundsOpaquely(!transparent_);
   Env::GetInstance()->NotifyWindowInitialized(this);
 }
 
 void Window::SetType(ui::wm::WindowType type) {
   // Cannot change type after the window is initialized.
   DCHECK(!layer());
   type_ = type;
 }
 
+const std::string& Window::GetName() const {
+  std::string* name = GetProperty(client::kNameKey);
+  return name ? *name : base::EmptyString();
+}
+
 void Window::SetName(const std::string& name) {
-  name_ = name;
+  if (name == GetName())
+    return;
+  SetProperty(client::kNameKey, new std::string(name));
   if (layer())
     UpdateLayerName();
 }
 
+const base::string16& Window::GetTitle() const {
+  base::string16* title = GetProperty(client::kTitleKey);
+  return title ? *title : base::EmptyString16();
+}
+
 void Window::SetTitle(const base::string16& title) {
-  if (title == title_)
+  if (title == GetTitle())
     return;
-  title_ = title;
+  SetProperty(client::kTitleKey, new base::string16(title));
   for (WindowObserver& observer : observers_)
     observer.OnWindowTitleChanged(this);
 }
 
 void Window::SetTransparent(bool transparent) {
   transparent_ = transparent;
   if (layer())
     layer()->SetFillsBoundsOpaquely(!transparent_);
 }
 
@@ skipping 421 matching lines @@
 }
 
 void Window::OnDeviceScaleFactorChanged(float device_scale_factor) {
   port_->OnDeviceScaleFactorChanged(device_scale_factor);
 }
 
 #if !defined(NDEBUG)
 std::string Window::GetDebugInfo() const {
   return base::StringPrintf(
       "%s<%d> bounds(%d, %d, %d, %d) %s %s opacity=%.1f",
-      name().empty() ? "Unknown" : name().c_str(), id(),
-      bounds().x(), bounds().y(), bounds().width(), bounds().height(),
+      GetName().empty() ? "Unknown" : GetName().c_str(), id(), bounds().x(),
+      bounds().y(), bounds().width(), bounds().height(),
       visible_ ? "WindowVisible" : "WindowHidden",
-      layer() ?
-          (layer()->GetTargetVisibility() ? "LayerVisible" : "LayerHidden") :
-          "NoLayer",
+      layer()
+          ? (layer()->GetTargetVisibility() ? "LayerVisible" : "LayerHidden")
+          : "NoLayer",
       layer() ? layer()->opacity() : 1.0f);
 }
 
 void Window::PrintWindowHierarchy(int depth) const {
   VLOG(0) << base::StringPrintf(
       "%*s%s", depth * 2, "", GetDebugInfo().c_str());
   for (Windows::const_iterator it = children_.begin();
        it != children_.end(); ++it) {
     Window* child = *it;
     child->PrintWindowHierarchy(depth + 1);
@@ skipping 463 matching lines @@
 void Window::ConvertEventToTarget(ui::EventTarget* target,
                                   ui::LocatedEvent* event) {
   event->ConvertLocationToTarget(this,
                                  static_cast<Window*>(target));
 }
 
 void Window::UpdateLayerName() {
 #if !defined(NDEBUG)
   DCHECK(layer());
 
-  std::string layer_name(name_);
+  std::string layer_name(GetName());
   if (layer_name.empty())
     layer_name = "Unnamed Window";
 
   if (id_ != -1)
     layer_name += " " + base::IntToString(id_);
 
   layer()->set_name(layer_name);
 #endif
 }
 
 }  // namespace aura