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

Unified Diff: components/mus/public/cpp/view.h

Issue 1351013002: Revert of Mandoline UI Process: Update namespaces and file names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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/public/cpp/util.h ('k') | components/mus/public/cpp/view_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/public/cpp/view.h
diff --git a/components/mus/public/cpp/view.h b/components/mus/public/cpp/view.h
index f65f79ab1540530bbdb857cc317b0f916e0d5053..e2cded914eccfa903559df73c66192646fe62e66 100644
--- a/components/mus/public/cpp/view.h
+++ b/components/mus/public/cpp/view.h
@@ -11,15 +11,15 @@
#include "base/callback.h"
#include "base/observer_list.h"
#include "components/mus/public/cpp/types.h"
-#include "components/mus/public/interfaces/mus_constants.mojom.h"
#include "components/mus/public/interfaces/surface_id.mojom.h"
+#include "components/mus/public/interfaces/view_manager_constants.mojom.h"
#include "components/mus/public/interfaces/view_tree.mojom.h"
#include "mojo/application/public/interfaces/service_provider.mojom.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
#include "third_party/mojo/src/mojo/public/cpp/system/macros.h"
#include "ui/mojo/geometry/geometry.mojom.h"
-namespace mus {
+namespace mojo {
class ServiceProviderImpl;
class View;
@@ -55,14 +55,14 @@
Id id() const { return id_; }
// Geometric disposition.
- const mojo::Rect& bounds() const { return bounds_; }
- void SetBounds(const mojo::Rect& bounds);
+ const Rect& bounds() const { return bounds_; }
+ void SetBounds(const Rect& bounds);
// Visibility (also see IsDrawn()). When created views are hidden.
bool visible() const { return visible_; }
void SetVisible(bool value);
- const mojo::ViewportMetrics& viewport_metrics() { return *viewport_metrics_; }
+ const ViewportMetrics& viewport_metrics() { return *viewport_metrics_; }
scoped_ptr<ViewSurface> RequestSurface();
@@ -120,7 +120,7 @@
void AddChild(View* child);
void RemoveChild(View* child);
- void Reorder(View* relative, mojo::OrderDirection direction);
+ void Reorder(View* relative, OrderDirection direction);
void MoveToFront();
void MoveToBack();
@@ -128,19 +128,19 @@
View* GetChildById(Id id);
- void SetTextInputState(mojo::TextInputStatePtr state);
- void SetImeVisibility(bool visible, mojo::TextInputStatePtr state);
+ void SetTextInputState(TextInputStatePtr state);
+ void SetImeVisibility(bool visible, TextInputStatePtr state);
// Focus.
void SetFocus();
bool HasFocus() const;
// Embedding. See view_tree.mojom for details.
- void Embed(mojo::ViewTreeClientPtr client);
+ void Embed(ViewTreeClientPtr client);
// NOTE: callback is run synchronously if Embed() is not allowed on this
// View.
- void Embed(mojo::ViewTreeClientPtr client,
+ void Embed(ViewTreeClientPtr client,
uint32_t policy_bitmask,
const EmbedCallback& callback);
@@ -168,11 +168,10 @@
void LocalAddChild(View* child);
void LocalRemoveChild(View* child);
// Returns true if the order actually changed.
- bool LocalReorder(View* relative, mojo::OrderDirection direction);
- void LocalSetBounds(const mojo::Rect& old_bounds,
- const mojo::Rect& new_bounds);
- void LocalSetViewportMetrics(const mojo::ViewportMetrics& old_metrics,
- const mojo::ViewportMetrics& new_metrics);
+ 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);
@@ -199,8 +198,8 @@
base::ObserverList<ViewObserver> observers_;
- mojo::Rect bounds_;
- mojo::ViewportMetricsPtr viewport_metrics_;
+ Rect bounds_;
+ ViewportMetricsPtr viewport_metrics_;
bool visible_;
@@ -224,6 +223,6 @@
MOJO_DISALLOW_COPY_AND_ASSIGN(View);
};
-} // namespace mus
+} // namespace mojo
#endif // COMPONENTS_MUS_PUBLIC_CPP_VIEW_H_
« no previous file with comments | « components/mus/public/cpp/util.h ('k') | components/mus/public/cpp/view_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698