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

Unified Diff: services/window_manager/view_target.cc

Issue 788453002: Put code in //services/window_manager in namespace window_manager (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « services/window_manager/view_target.h ('k') | services/window_manager/view_target_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/window_manager/view_target.cc
diff --git a/services/window_manager/view_target.cc b/services/window_manager/view_target.cc
index 9c735d0e9a7ea59d01894708fd64717e0fff13d6..25c5615a032c6f91470b382bf58194e138580de1 100644
--- a/services/window_manager/view_target.cc
+++ b/services/window_manager/view_target.cc
@@ -16,7 +16,7 @@
#include "ui/gfx/point3_f.h"
#include "ui/gfx/transform.h"
-namespace mojo {
+namespace window_manager {
namespace {
@@ -28,7 +28,7 @@ ViewTarget::~ViewTarget() {
}
// static
-ViewTarget* ViewTarget::TargetFromView(View* view) {
+ViewTarget* ViewTarget::TargetFromView(mojo::View* view) {
if (!view)
return nullptr;
@@ -59,7 +59,7 @@ void ViewTarget::ConvertPointToTarget(const ViewTarget* source,
std::vector<ViewTarget*> ViewTarget::GetChildren() {
std::vector<ViewTarget*> targets;
- for (View* child : view_->children())
+ for (mojo::View* child : view_->children())
targets.push_back(TargetFromView(child));
return targets;
}
@@ -133,7 +133,7 @@ void ViewTarget::ConvertEventToTarget(ui::EventTarget* target,
event->ConvertLocationToTarget(this, static_cast<ViewTarget*>(target));
}
-ViewTarget::ViewTarget(View* view_to_wrap) : view_(view_to_wrap) {
+ViewTarget::ViewTarget(mojo::View* view_to_wrap) : view_(view_to_wrap) {
DCHECK(view_->GetLocalProperty(kViewTargetKey) == nullptr);
view_->SetLocalProperty(kViewTargetKey, this);
}
@@ -164,4 +164,4 @@ bool ViewTarget::GetTargetOffsetRelativeTo(const ViewTarget* ancestor,
return v == ancestor;
}
-} // namespace mojo
+} // namespace window_manager
« no previous file with comments | « services/window_manager/view_target.h ('k') | services/window_manager/view_target_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698