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

Unified Diff: mojo/examples/window_manager/debug_panel.h

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/examples/png_viewer/png_viewer.cc ('k') | mojo/examples/window_manager/debug_panel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/window_manager/debug_panel.h
diff --git a/mojo/examples/window_manager/debug_panel.h b/mojo/examples/window_manager/debug_panel.h
index 532ebce14050e34b7f8b152468514dc065170bd2..5e6619b3dafb7753f2429f627ff0f5571f4aae36 100644
--- a/mojo/examples/window_manager/debug_panel.h
+++ b/mojo/examples/window_manager/debug_panel.h
@@ -20,9 +20,7 @@ class RadioButton;
namespace mojo {
-namespace view_manager {
class Node;
-}
namespace examples {
@@ -47,7 +45,7 @@ class DebugPanel : public views::LayoutManager, public views::ButtonListener {
virtual ~Delegate(){}
};
- DebugPanel(Delegate* delegate, view_manager::Node* node);
+ DebugPanel(Delegate* delegate, Node* node);
virtual ~DebugPanel();
navigation::Target navigation_target() const;
@@ -62,7 +60,7 @@ class DebugPanel : public views::LayoutManager, public views::ButtonListener {
void Navigate(const std::string& url);
Delegate* delegate_;
- view_manager::Node* node_;
+ Node* node_;
views::Label* navigation_target_label_;
views::RadioButton* navigation_target_new_;
« no previous file with comments | « mojo/examples/png_viewer/png_viewer.cc ('k') | mojo/examples/window_manager/debug_panel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698