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

Unified Diff: third_party/mojo/src/mojo/edk/system/unique_identifier.h

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use run_renderer_in_process() Created 5 years, 10 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
Index: third_party/mojo/src/mojo/edk/system/unique_identifier.h
diff --git a/third_party/mojo/src/mojo/edk/system/unique_identifier.h b/third_party/mojo/src/mojo/edk/system/unique_identifier.h
index a7f68bab222cbf24e51e73a869d21de330a05435..c9cba8836b4c5bbb1cab82a43c99ec1305e419ea 100644
--- a/third_party/mojo/src/mojo/edk/system/unique_identifier.h
+++ b/third_party/mojo/src/mojo/edk/system/unique_identifier.h
@@ -31,6 +31,13 @@ struct hash<mojo::system::UniqueIdentifier>;
} // BASE_HASH_NAMESPACE
namespace mojo {
+
+namespace embedder {
+
+class PlatformSupport;
+
+} // namespace embedder
+
namespace system {
// Declare this before |UniqueIdentifier|, so that it can be friended.
@@ -44,7 +51,7 @@ class MOJO_SYSTEM_IMPL_EXPORT UniqueIdentifier {
public:
// This generates a new identifier. Uniqueness is "guaranteed" (i.e.,
// probabilistically) for identifiers.
- static UniqueIdentifier Generate();
+ static UniqueIdentifier Generate(embedder::PlatformSupport* platform_support);
bool operator==(const UniqueIdentifier& other) const {
return memcmp(data_, other.data_, sizeof(data_)) == 0;
@@ -58,7 +65,9 @@ class MOJO_SYSTEM_IMPL_EXPORT UniqueIdentifier {
private:
friend BASE_HASH_NAMESPACE::hash<mojo::system::UniqueIdentifier>;
- friend std::ostream& operator<<(std::ostream&, const UniqueIdentifier&);
+ friend MOJO_SYSTEM_IMPL_EXPORT std::ostream& operator<<(
+ std::ostream&,
+ const UniqueIdentifier&);
explicit UniqueIdentifier() {}

Powered by Google App Engine
This is Rietveld 408576698