Nukes view_manager namespace

mojo/examples/browser/browser.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/examples/window_manager/window_manager.mojom.h"
 #include "mojo/public/cpp/application/application_connection.h"
@@ skipping 52 matching lines @@
 // TODO(sky): it would be nice if this were put in NativeWidgetViewManager, but
 // that requires NativeWidgetViewManager to take an IWindowManager. That may be
 // desirable anyway...
 class KeyboardManager
     : public views::FocusChangeListener,
       public ui::EventHandler,
       public views::WidgetObserver {
  public:
   KeyboardManager(views::Widget* widget,
                   IWindowManager* window_manager,
-                  view_manager::Node* node)
+                  Node* node)
       : widget_(widget),
         window_manager_(window_manager),
         node_(node),
         last_view_id_(0),
         focused_view_(NULL) {
     widget_->GetFocusManager()->AddFocusChangeListener(this);
     widget_->AddObserver(this);
     widget_->GetNativeView()->AddPostTargetHandler(this);
   }
 
@@ skipping 48 matching lines @@
     }
   }
 
   // views::WidgetObserver:
   virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE {
     delete this;
   }
 
   views::Widget* widget_;
   IWindowManager* window_manager_;
-  view_manager::Node* node_;
-  view_manager::Id last_view_id_;
+  Node* node_;
+  Id last_view_id_;
   views::View* focused_view_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyboardManager);
 };
 
 // This is the basics of creating a views widget with a textfield.
 // TODO: cleanup!
 class Browser : public ApplicationDelegate,
-                public view_manager::ViewManagerDelegate,
+                public ViewManagerDelegate,
                 public views::TextfieldController,
-                public view_manager::NodeObserver {
+                public NodeObserver {
  public:
   Browser()
       : view_manager_(NULL),
         view_manager_client_factory_(this),
         root_(NULL),
         widget_(NULL) {}
 
   virtual ~Browser() {
     if (root_)
       root_->RemoveObserver(this);
   }
 
  private:
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE {
     views_init_.reset(new ViewsInit);
     app->ConnectToService("mojo:mojo_window_manager", &navigator_host_);
     app->ConnectToService("mojo:mojo_window_manager", &window_manager_);
  }
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       MOJO_OVERRIDE {
     connection->AddService(&view_manager_client_factory_);
     return true;
   }
 
-  void CreateWidget(view_manager::Node* node) {
+  void CreateWidget(Node* node) {
     views::Textfield* textfield = new views::Textfield;
     textfield->set_controller(this);
 
     views::WidgetDelegateView* widget_delegate = new views::WidgetDelegateView;
     widget_delegate->GetContentsView()->set_background(
         views::Background::CreateSolidBackground(SK_ColorBLUE));
     widget_delegate->GetContentsView()->AddChildView(textfield);
     widget_delegate->GetContentsView()->SetLayoutManager(
         new BrowserLayoutManager);
 
     widget_ = new views::Widget;
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.native_widget = new NativeWidgetViewManager(widget_, node);
     params.delegate = widget_delegate;
     params.bounds = gfx::Rect(node->bounds().width(), node->bounds().height());
     widget_->Init(params);
     // KeyboardManager handles deleting itself when the widget is destroyed.
     new KeyboardManager(widget_, window_manager_.get(), node);
     widget_->Show();
     textfield->RequestFocus();
   }
 
-  // view_manager::ViewManagerDelegate:
-  virtual void OnRootAdded(view_manager::ViewManager* view_manager,
-                           view_manager::Node* root) OVERRIDE {
+  // ViewManagerDelegate:
+  virtual void OnRootAdded(ViewManager* view_manager, Node* root) OVERRIDE {
     // TODO: deal with OnRootAdded() being invoked multiple times.
     view_manager_ = view_manager;
     root_ = root;
     root_->AddObserver(this);
-    root_->SetActiveView(view_manager::View::Create(view_manager));
+    root_->SetActiveView(View::Create(view_manager));
     root_->SetFocus();
     CreateWidget(root_);
   }
   virtual void OnViewManagerDisconnected(
-      view_manager::ViewManager* view_manager) OVERRIDE {
+      ViewManager* view_manager) OVERRIDE {
     DCHECK_EQ(view_manager_, view_manager);
     view_manager_ = NULL;
     base::MessageLoop::current()->Quit();
   }
 
   // views::TextfieldController:
   virtual bool HandleKeyEvent(views::Textfield* sender,
                               const ui::KeyEvent& key_event) OVERRIDE {
     if (key_event.key_code() == ui::VKEY_RETURN) {
       GURL url(sender->text());
       printf("User entered this URL: %s\n", url.spec().c_str());
       navigation::NavigationDetailsPtr nav_details(
           navigation::NavigationDetails::New());
       nav_details->url = String::From(url);
       navigator_host_->RequestNavigate(view_manager_->GetRoots().front()->id(),
                                        navigation::TARGET_NEW_NODE,
                                        nav_details.Pass());
     }
     return false;
   }
 
   // NodeObserver:
-  virtual void OnNodeFocusChanged(view_manager::Node* gained_focus,
-                                  view_manager::Node* lost_focus) OVERRIDE {
+  virtual void OnNodeFocusChanged(Node* gained_focus,
+                                  Node* lost_focus) OVERRIDE {
     aura::client::FocusClient* focus_client =
         aura::client::GetFocusClient(widget_->GetNativeView());
     if (lost_focus == root_)
       focus_client->FocusWindow(NULL);
     else if (gained_focus == root_)
       focus_client->FocusWindow(widget_->GetNativeView());
   }
-  virtual void OnNodeDestroyed(view_manager::Node* node) OVERRIDE {
+  virtual void OnNodeDestroyed(Node* node) OVERRIDE {
     DCHECK_EQ(root_, node);
     node->RemoveObserver(this);
     root_ = NULL;
   }
 
   scoped_ptr<ViewsInit> views_init_;
 
-  view_manager::ViewManager* view_manager_;
-  view_manager::ViewManagerClientFactory view_manager_client_factory_;
-  view_manager::Node* root_;
+  ViewManager* view_manager_;
+  ViewManagerClientFactory view_manager_client_factory_;
+  Node* root_;
   views::Widget* widget_;
   navigation::NavigatorHostPtr navigator_host_;
   IWindowManagerPtr window_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 }  // namespace examples
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::Browser;
 }
 
 }  // namespace mojo