Splits debug_commands into aura and non-aura parts

ui/views/mus/window_manager_connection.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/views/mus/window_manager_connection.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
@@ skipping 18 matching lines @@
 
 using WindowManagerConnectionPtr =
     base::ThreadLocalPointer<views::WindowManagerConnection>;
 
 // Env is thread local so that aura may be used on multiple threads.
 base::LazyInstance<WindowManagerConnectionPtr>::Leaky lazy_tls_ptr =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
+WindowManagerConnection::~WindowManagerConnection() {
+  // ~WindowTreeClient calls back to us (we're its delegate), destroy it while
+  // we are still valid.
+  client_.reset();
+  ui::Clipboard::DestroyClipboardForCurrentThread();
+  ui::GpuService::Terminate();
+  lazy_tls_ptr.Pointer()->Set(nullptr);
+
+  if (ViewsDelegate::GetInstance()) {
+    ViewsDelegate::GetInstance()->set_native_widget_factory(
+        ViewsDelegate::NativeWidgetFactory());
+  }
+}
+
 // static
 std::unique_ptr<WindowManagerConnection> WindowManagerConnection::Create(
     shell::Connector* connector,
     const shell::Identity& identity) {
   DCHECK(!lazy_tls_ptr.Pointer()->Get());
   WindowManagerConnection* connection =
       new WindowManagerConnection(connector, identity);
   DCHECK(lazy_tls_ptr.Pointer()->Get());
   return base::WrapUnique(connection);
 }
@@ skipping 100 matching lines @@
   std::unique_ptr<ClipboardMus> clipboard(new ClipboardMus);
   clipboard->Init(connector);
   ui::Clipboard::SetClipboardForCurrentThread(std::move(clipboard));
 
   ViewsDelegate::GetInstance()->set_native_widget_factory(base::Bind(
       &WindowManagerConnection::CreateNativeWidgetMus,
       base::Unretained(this),
       std::map<std::string, std::vector<uint8_t>>()));
 }
 
-WindowManagerConnection::~WindowManagerConnection() {
-  // ~WindowTreeClient calls back to us (we're its delegate), destroy it while
-  // we are still valid.
-  client_.reset();
-  ui::Clipboard::DestroyClipboardForCurrentThread();
-  ui::GpuService::Terminate();
-  lazy_tls_ptr.Pointer()->Set(nullptr);
-
-  if (ViewsDelegate::GetInstance()) {
-    ViewsDelegate::GetInstance()->set_native_widget_factory(
-        ViewsDelegate::NativeWidgetFactory());
-  }
-}
-
 bool WindowManagerConnection::HasPointerDownWatcher() {
   // Check to see if we really have any observers left. This doesn't use
   // base::ObserverList<>::might_have_observers() because that returns true
   // during iteration over the list even when the last observer is removed.
   base::ObserverList<PointerDownWatcher>::Iterator iterator(
       &pointer_down_watchers_);
   return !!iterator.GetNext();
 }
 
 bool WindowManagerConnection::HasTouchEventWatcher() {
@@ skipping 51 matching lines @@
 void WindowManagerConnection::OnWindowManagerFrameValuesChanged() {
   if (client_)
     NativeWidgetMus::NotifyFrameChanged(client_.get());
 }
 
 gfx::Point WindowManagerConnection::GetCursorScreenPoint() {
   return client_->GetCursorScreenPoint();
 }
 
 }  // namespace views