Change userid from a uint32_t to a string guid

components/mus/ws/display.h

 // 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 COMPONENTS_MUS_WS_DISPLAY_H_
 #define COMPONENTS_MUS_WS_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 91 matching lines @@
   // Returns the root of the Display. The root's children are the roots
   // of the corresponding WindowManagers.
   ServerWindow* root_window() { return root_.get(); }
   const ServerWindow* root_window() const { return root_.get(); }
 
   ServerWindow* GetRootWithId(const WindowId& id);
 
   WindowManagerState* GetWindowManagerStateWithRoot(const ServerWindow* window);
   // TODO(sky): this is wrong, plumb through user_id.
   WindowManagerState* GetFirstWindowManagerState();
-  WindowManagerState* GetWindowManagerStateForUser(UserId user_id);
+  WindowManagerState* GetWindowManagerStateForUser(const UserId& user_id);
   size_t num_window_manger_states() const {
     return window_manager_state_map_.size();
   }
 
   void SetCapture(ServerWindow* window, bool in_nonclient_area);
 
   void SetFocusedWindow(ServerWindow* window);
   ServerWindow* GetFocusedWindow();
   void DestroyFocusController();
   FocusController* focus_controller() { return focus_controller_.get(); }
@@ skipping 30 matching lines @@
   void SetSize(mojo::SizePtr size) override;
   void SetTitle(const mojo::String& title) override;
 
   void OnEventAck(mojom::WindowTree* tree);
 
  private:
   class ProcessedEventTarget;
   friend class test::DisplayTestApi;
 
   using WindowManagerStateMap =
-      std::map<uint32_t, scoped_ptr<WindowManagerState>>;
+      std::map<UserId, scoped_ptr<WindowManagerState>>;
 
   // There are two types of events that may be queued, both occur only when
   // waiting for an ack from a client.
   // . We get an event from the PlatformDisplay. This results in |event| being
   //   set, but |processed_target| is null.
   // . We get an event from the EventDispatcher. In this case both |event| and
   //   |processed_target| are valid.
   // The second case happens if EventDispatcher generates more than one event
   // at a time.
   struct QueuedEvent {
@@ skipping 61 matching lines @@
   void ReleaseNativeCapture() override;
   void OnServerWindowCaptureLost(ServerWindow* window) override;
   void DispatchInputEventToWindow(ServerWindow* target,
                                   bool in_nonclient_area,
                                   const ui::Event& event) override;
 
   // ServerWindowObserver:
   void OnWindowDestroyed(ServerWindow* window) override;
 
   // UserIdTrackerObserver:
-  void OnActiveUserIdChanged(UserId id) override;
-  void OnUserIdAdded(UserId id) override;
-  void OnUserIdRemoved(UserId id) override;
+  void OnActiveUserIdChanged(const UserId& id) override;
+  void OnUserIdAdded(const UserId& id) override;
+  void OnUserIdRemoved(const UserId& id) override;
 
   // WindowManagerFactoryRegistryObserver:
   void OnWindowManagerFactorySet(WindowManagerFactoryService* service) override;
 
   const uint32_t id_;
   scoped_ptr<DisplayBinding> binding_;
   // Set once Init() has been called.
   bool init_called_ = false;
   ConnectionManager* const connection_manager_;
   EventDispatcher event_dispatcher_;
@@ skipping 18 matching lines @@
 
   mojom::FrameDecorationValuesPtr frame_decoration_values_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_DISPLAY_H_