WIP: Propagate SurfaceID up window tree hierarchy

services/ui/surfaces/surfaces_state.h

Index: services/ui/surfaces/surfaces_state.h
diff --git a/services/ui/surfaces/surfaces_state.h b/services/ui/surfaces/surfaces_state.h
deleted file mode 100644
index c35f9005ab3a4c17c37b4806423ce7f0fbbcf024..0000000000000000000000000000000000000000
--- a/services/ui/surfaces/surfaces_state.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// 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.
-
-#ifndef SERVICES_UI_SURFACES_SURFACES_STATE_H_
-#define SERVICES_UI_SURFACES_SURFACES_STATE_H_
-
-#include <stdint.h>
-
-#include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#include "cc/surfaces/surface_manager.h"
-
-namespace cc {
-class SurfaceHittest;
-class SurfaceManager;
-}  // namespace cc
-
-namespace ui {
-
-// The SurfacesState object is an object global to the Window Manager app that
-// holds the SurfaceManager and allocates new Surfaces namespaces.
-// This object lives on the main thread of the Window Manager.
-// TODO(rjkroege, fsamuel): This object will need to change to support multiple
-// displays.
-class SurfacesState : public base::RefCounted<SurfacesState> {
- public:
-  SurfacesState();
-
-  uint32_t next_client_id() { return next_client_id_++; }
-
-  cc::SurfaceManager* manager() { return &manager_; }
-
- private:
-  friend class base::RefCounted<SurfacesState>;
-  ~SurfacesState();
-
-  // A Surface ID is an unsigned 64-bit int where the high 32-bits are generated
-  // by the Surfaces service, and the low 32-bits are generated by the process
-  // that requested the Surface.
-  uint32_t next_client_id_;
-  cc::SurfaceManager manager_;
-
-  DISALLOW_COPY_AND_ASSIGN(SurfacesState);
-};
-
-}  // namespace ui
-
-#endif  //  SERVICES_UI_SURFACES_SURFACES_STATE_H_