Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(500)

Unified Diff: components/mus/ws/window_manager_state.h

Issue 1770533002: Change userid from a uint32_t to a string guid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@33connector
Patch Set: . Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/mus/ws/window_manager_factory_service.cc ('k') | components/mus/ws/window_manager_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/window_manager_state.h
diff --git a/components/mus/ws/window_manager_state.h b/components/mus/ws/window_manager_state.h
index 0d9077ddfa166aea7d67b47b53dc4561b4a21bab..adc30c10959cfcd3a00935d805c950811863489e 100644
--- a/components/mus/ws/window_manager_state.h
+++ b/components/mus/ws/window_manager_state.h
@@ -8,6 +8,7 @@
#include <stdint.h>
#include "base/memory/scoped_ptr.h"
+#include "components/mus/ws/user_id.h"
namespace mus {
namespace ws {
@@ -22,7 +23,7 @@ class WindowManagerState {
public:
// Creates a WindowManagerState that can host content from any user.
explicit WindowManagerState(Display* display);
- WindowManagerState(Display* display, uint32_t user_id);
+ WindowManagerState(Display* display, const UserId& user_id);
~WindowManagerState();
bool is_user_id_valid() const { return is_user_id_valid_; }
@@ -36,14 +37,15 @@ class WindowManagerState {
private:
friend class Display;
- WindowManagerState(Display* display, bool is_user_id_valid, uint32_t user_id);
+ WindowManagerState(Display* display, bool is_user_id_valid,
+ const UserId& user_id);
Display* display_;
// If this was created implicitly by a call
// WindowTreeHostFactory::CreateWindowTreeHost(), then |is_user_id_valid_|
// is false.
const bool is_user_id_valid_;
- const uint32_t user_id_;
+ const UserId user_id_;
scoped_ptr<ServerWindow> root_;
WindowTree* tree_ = nullptr;
« no previous file with comments | « components/mus/ws/window_manager_factory_service.cc ('k') | components/mus/ws/window_manager_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698