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

Unified Diff: third_party/mojo_services/src/view_manager/public/cpp/view.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_services/src/view_manager/public/cpp/view.h
diff --git a/third_party/mojo_services/src/view_manager/public/cpp/view.h b/third_party/mojo_services/src/view_manager/public/cpp/view.h
index d888ef0998d80b4260f9d45cda1615b7969636a8..fcb49bc8913d42b92bb8076d6851ed762ff2a08b 100644
--- a/third_party/mojo_services/src/view_manager/public/cpp/view.h
+++ b/third_party/mojo_services/src/view_manager/public/cpp/view.h
@@ -5,12 +5,13 @@
#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
+#include <stdint.h>
#include <vector>
-#include "base/basictypes.h"
#include "base/observer_list.h"
#include "geometry/public/interfaces/geometry.mojom.h"
#include "mojo/public/cpp/bindings/array.h"
+#include "mojo/public/cpp/system/macros.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
#include "surfaces/public/interfaces/surface_id.mojom.h"
#include "view_manager/public/cpp/types.h"
@@ -87,7 +88,7 @@ class View {
void ClearLocalProperty(const ViewProperty<T>* property);
// Type of a function to delete a property that this view owns.
- typedef void (*PropertyDeallocator)(int64 value);
+ typedef void (*PropertyDeallocator)(int64_t value);
// A View is drawn if the View and all its ancestors are visible and the
// View is attached to the root.
@@ -141,12 +142,13 @@ class View {
View(ViewManager* manager, Id id);
// Called by the public {Set,Get,Clear}Property functions.
- int64 SetLocalPropertyInternal(const void* key,
- const char* name,
- PropertyDeallocator deallocator,
- int64 value,
- int64 default_value);
- int64 GetLocalPropertyInternal(const void* key, int64 default_value) const;
+ int64_t SetLocalPropertyInternal(const void* key,
+ const char* name,
+ PropertyDeallocator deallocator,
+ int64_t value,
+ int64_t default_value);
+ int64_t GetLocalPropertyInternal(const void* key,
+ int64_t default_value) const;
void LocalDestroy();
void LocalAddChild(View* child);
@@ -157,6 +159,7 @@ class View {
void LocalSetViewportMetrics(const ViewportMetrics& old_metrics,
const ViewportMetrics& new_metrics);
void LocalSetDrawn(bool drawn);
+ void LocalSetVisible(bool visible);
// Methods implementing visibility change notifications. See ViewObserver
// for more details.
@@ -193,13 +196,13 @@ class View {
// WindowProperty<>.
struct Value {
const char* name;
- int64 value;
+ int64_t value;
PropertyDeallocator deallocator;
};
std::map<const void*, Value> prop_map_;
- DISALLOW_COPY_AND_ASSIGN(View);
+ MOJO_DISALLOW_COPY_AND_ASSIGN(View);
};
} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698