Index: mojo/services/view_manager/cpp/lib/view_private.h |
diff --git a/mojo/services/view_manager/public/cpp/lib/view_private.h b/mojo/services/view_manager/cpp/lib/view_private.h |
similarity index 70% |
rename from mojo/services/view_manager/public/cpp/lib/view_private.h |
rename to mojo/services/view_manager/cpp/lib/view_private.h |
index 1d149a56170554d7fa77d470a51741194bc90287..731c678bb2222169f2f82f6576ae202c7356c870 100644 |
--- a/mojo/services/view_manager/public/cpp/lib/view_private.h |
+++ b/mojo/services/view_manager/cpp/lib/view_private.h |
@@ -2,10 +2,10 @@ |
// 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_LIB_VIEW_PRIVATE_H_ |
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_PRIVATE_H_ |
+#ifndef MOJO_SERVICES_VIEW_MANAGER_CPP_LIB_VIEW_PRIVATE_H_ |
+#define MOJO_SERVICES_VIEW_MANAGER_CPP_LIB_VIEW_PRIVATE_H_ |
-#include "view_manager/public/cpp/view.h" |
+#include "view_manager/cpp/view.h" |
namespace mojo { |
@@ -29,9 +29,7 @@ class ViewPrivate { |
void set_id(Id id) { view_->id_ = id; } |
- void set_view_manager(ViewManager* manager) { |
- view_->manager_ = manager; |
- } |
+ void set_view_manager(ViewManager* manager) { view_->manager_ = manager; } |
void set_properties(const std::map<std::string, std::vector<uint8_t>>& data) { |
view_->properties_ = data; |
@@ -42,20 +40,13 @@ class ViewPrivate { |
view_->LocalSetViewportMetrics(new_metrics, new_metrics); |
} |
- void LocalDestroy() { |
- view_->LocalDestroy(); |
- } |
- void LocalAddChild(View* child) { |
- view_->LocalAddChild(child); |
- } |
- void LocalRemoveChild(View* child) { |
- view_->LocalRemoveChild(child); |
- } |
+ void LocalDestroy() { view_->LocalDestroy(); } |
+ void LocalAddChild(View* child) { view_->LocalAddChild(child); } |
+ void LocalRemoveChild(View* child) { view_->LocalRemoveChild(child); } |
void LocalReorder(View* relative, OrderDirection direction) { |
view_->LocalReorder(relative, direction); |
} |
- void LocalSetBounds(const Rect& old_bounds, |
- const Rect& new_bounds) { |
+ void LocalSetBounds(const Rect& old_bounds, const Rect& new_bounds) { |
view_->LocalSetBounds(old_bounds, new_bounds); |
} |
void LocalSetDrawn(bool drawn) { view_->LocalSetDrawn(drawn); } |
@@ -69,4 +60,4 @@ class ViewPrivate { |
} // namespace mojo |
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_PRIVATE_H_ |
+#endif // MOJO_SERVICES_VIEW_MANAGER_CPP_LIB_VIEW_PRIVATE_H_ |