Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819

third_party/mojo_services/src/view_manager/public/cpp/view.h

 // Copyright 2014 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 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"
 #include "view_manager/public/interfaces/view_manager.mojom.h"
 #include "view_manager/public/interfaces/view_manager_constants.mojom.h"
 
 namespace mojo {
 
 class ServiceProviderImpl;
 class View;
@@ skipping 56 matching lines @@
 
   // Sets the |property| to its default value. Useful for avoiding a cast when
   // setting to NULL.
   //
   // These properties are only visible in the current process and are not
   // shared with other mojo services.
   template <typename T>
   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.
   bool IsDrawn() const;
 
   // Observation.
   void AddObserver(ViewObserver* observer);
   void RemoveObserver(ViewObserver* observer);
 
   // Tree.
@@ skipping 33 matching lines @@
   View();
   ~View();
 
  private:
   friend class ViewPrivate;
   friend class ViewManagerClientImpl;
 
   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);
   void LocalRemoveChild(View* child);
   // Returns true if the order actually changed.
   bool LocalReorder(View* relative, OrderDirection direction);
   void LocalSetBounds(const Rect& old_bounds, const Rect& new_bounds);
   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.
   void NotifyViewVisibilityChanged(View* target);
   // Notifies this view's observers. Returns false if |this| was deleted during
   // the call (by an observer), otherwise true.
   bool NotifyViewVisibilityChangedAtReceiver(View* target);
   // Notifies this view and its child hierarchy. Returns false if |this| was
   // deleted during the call (by an observer), otherwise true.
   bool NotifyViewVisibilityChangedDown(View* target);
@@ skipping 16 matching lines @@
 
   // Drawn state is derived from the visible state and the parent's visible
   // state. This field is only used if the view has no parent (eg it's a root).
   bool drawn_;
 
   // Value struct to keep the name and deallocator for this property.
   // Key cannot be used for this purpose because it can be char* or
   // 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
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_