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

Unified Diff: mojo/services/view_manager/node.cc

Issue 418983002: Nukes view_manager namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: resolve merge Created 6 years, 5 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 | « mojo/services/view_manager/node.h ('k') | mojo/services/view_manager/node_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/view_manager/node.cc
diff --git a/mojo/services/view_manager/node.cc b/mojo/services/view_manager/node.cc
index 13993bf572ba6db7d59975f1b69c63a264307afb..65bc94684c728259819f16571a98106b101ff79d 100644
--- a/mojo/services/view_manager/node.cc
+++ b/mojo/services/view_manager/node.cc
@@ -13,10 +13,9 @@
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/native_widget_types.h"
-DECLARE_WINDOW_PROPERTY_TYPE(mojo::view_manager::service::Node*);
+DECLARE_WINDOW_PROPERTY_TYPE(mojo::service::Node*);
namespace mojo {
-namespace view_manager {
namespace service {
DEFINE_WINDOW_PROPERTY_KEY(Node*, kNodeKey, NULL);
@@ -213,5 +212,4 @@ void Node::OnEvent(ui::Event* event) {
}
} // namespace service
-} // namespace view_manager
} // namespace mojo
« no previous file with comments | « mojo/services/view_manager/node.h ('k') | mojo/services/view_manager/node_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698