mus: Add debug key to print the server window hierarchy

components/mus/ws/server_window.cc

 // Copyright 2014 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 "components/mus/ws/server_window.h"
 
 #include <inttypes.h>
 #include <stddef.h>
 
 #include "base/strings/stringprintf.h"
 #include "components/mus/common/transient_window_utils.h"
+#include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "components/mus/ws/server_window_delegate.h"
 #include "components/mus/ws/server_window_observer.h"
 #include "components/mus/ws/server_window_surface_manager.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 
 namespace mus {
 
 namespace ws {
 
 namespace {
@@ skipping 316 matching lines @@
   if (value) {
     properties_[name] = *value;
   } else if (it != properties_.end()) {
     properties_.erase(it);
   }
 
   FOR_EACH_OBSERVER(ServerWindowObserver, observers_,
                     OnWindowSharedPropertyChanged(this, name, value));
 }
 
+std::string ServerWindow::GetName() const {
+  auto it = properties_.find(mojom::WindowManager::kName_Property);
+  if (it == properties_.end())
+    return std::string();
+  return std::string(it->second.begin(), it->second.end());

[msw, 2016/05/05 22:12:07]

nit: use the property_type_converter?

[James Cook, 2016/05/05 22:53:18]

I can't, property_type_converters.cc is in components/mus/public/cpp and
components/mus/ws cannot depend on that, by design.

//components/mus/public/cpp has a data_dep on //components/mus, so you get a
circular dependency. I've talked to Scott about this in the past and he wants to
keep it, the theory being that anyone who depends on //components/mus/public/cpp
needs all of mus to be built/run, and also the /ws stuff is an implementation
detail of mus and hence shouldn't rely on code in /public.

If you really want the property converter I could try moving it to
components/mus/common.

[msw, 2016/05/05 23:10:06]

Nah, I guess this is fine as-is.

+}
+
 void ServerWindow::SetTextInputState(const ui::TextInputState& state) {
   const bool changed = !(text_input_state_ == state);
   if (changed) {
     text_input_state_ = state;
     // keyboard even if the state is not changed. So we have to notify
     // |observers_|.
     FOR_EACH_OBSERVER(ServerWindowObserver, observers_,
                       OnWindowTextInputStateChanged(this, state));
   }
 }
@@ skipping 37 matching lines @@
 #if !defined(NDEBUG)
 std::string ServerWindow::GetDebugWindowHierarchy() const {
   std::string result;
   BuildDebugInfo(std::string(), &result);
   return result;
 }
 
 void ServerWindow::BuildDebugInfo(const std::string& depth,
                                   std::string* result) const {
   *result += base::StringPrintf(
-      "%sid=%d,%d visible=%s bounds=%d,%d %dx%d" PRIu64 "\n", depth.c_str(),
+      "%sid=%d,%d visible=%s bounds=%d,%d %dx%d %s\n", depth.c_str(),

[msw, 2016/05/05 22:12:08]

nit: maybe name='%s'?

[James Cook, 2016/05/05 22:53:18]

Done.

       static_cast<int>(id_.connection_id), static_cast<int>(id_.window_id),
       visible_ ? "true" : "false", bounds_.x(), bounds_.y(), bounds_.width(),
-      bounds_.height());
+      bounds_.height(), GetName().c_str());
   for (const ServerWindow* child : children_)
     child->BuildDebugInfo(depth + "  ", result);
 }
 #endif
 
 void ServerWindow::RemoveImpl(ServerWindow* window) {
   window->parent_ = nullptr;
   children_.erase(std::find(children_.begin(), children_.end(), window));
 }
 
@@ skipping 40 matching lines @@
 }
 
 // static
 ServerWindow** ServerWindow::GetStackingTarget(ServerWindow* window) {
   return &window->stacking_target_;
 }
 
 }  // namespace ws
 
 }  // namespace mus