Improve some debug tools for mus.

services/ui/ws/server_window.h

 // 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.
 
 #ifndef SERVICES_UI_WS_SERVER_WINDOW_H_
 #define SERVICES_UI_WS_SERVER_WINDOW_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 164 matching lines @@
   const ServerWindowSurfaceManager* surface_manager() const {
     return surface_manager_.get();
   }
 
   // Offset of the underlay from the the window bounds (used for shadows).
   const gfx::Vector2d& underlay_offset() const { return underlay_offset_; }
   void SetUnderlayOffset(const gfx::Vector2d& offset);
 
   ServerWindowDelegate* delegate() { return delegate_; }
 
-#if !defined(NDEBUG)
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
   std::string GetDebugWindowHierarchy() const;
+  std::string GetDebugWindowInfo() const;
   void BuildDebugInfo(const std::string& depth, std::string* result) const;
 #endif
 
  private:
   // Implementation of removing a window. Doesn't send any notification.
   void RemoveImpl(ServerWindow* window);
 
   // Called when this window's stacking order among its siblings is changed.
   void OnStackingChanged();
 
@@ skipping 45 matching lines @@
 
   base::ObserverList<ServerWindowObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerWindow);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_SERVER_WINDOW_H_