Moves Create() off of View and onto ViewManager

examples/window_manager/window_manager.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/bind.h"
 #include "base/macros.h"
 #include "examples/keyboard/keyboard.mojom.h"
 #include "examples/window_manager/debug_panel.h"
 #include "examples/window_manager/window_manager.mojom.h"
 #include "mojo/application/application_runner_chromium.h"
@@ skipping 81 matching lines @@
       view_->parent()->RemoveObserver(this);
   }
 
   View* view() { return view_; }
 
   void Init(ApplicationImpl* application,
             ViewManager* view_manager,
             View* parent,
             const Rect& bounds) {
     view_manager_ = view_manager;
-    view_ = View::Create(view_manager);
+    view_ = view_manager->CreateView();
     view_->SetBounds(bounds);
     parent->AddChild(view_);
     view_->Embed("mojo:keyboard");
     application->ConnectToService("mojo:keyboard", &keyboard_service_);
     keyboard_service_.set_client(this);
     parent->AddObserver(this);
   }
 
   void Show(Id view_id, const Rect& bounds) {
     keyboard_service_->SetTarget(view_id);
@@ skipping 232 matching lines @@
     return true;
   }
 
   // Overridden from ViewManagerDelegate:
   virtual void OnEmbed(View* root,
                        ServiceProviderImpl* exported_services,
                        scoped_ptr<ServiceProvider> imported_services) override {
     DCHECK(!view_manager_);
     view_manager_ = root->view_manager();
 
-    View* view = View::Create(view_manager_);
+    View* view = view_manager_->CreateView();
     root->AddChild(view);
     Rect rect;
     rect.width = root->bounds().width;
     rect.height = root->bounds().height;
     view->SetBounds(rect);
     view->SetVisible(true);
     content_view_id_ = view->id();
 
     Id launcher_ui_id = CreateLauncherUI();
     Id control_panel_id = CreateControlPanel(view);
@@ skipping 89 matching lines @@
         view->bounds().height - (3 * kBorderInset + kTextfieldHeight);
     if (!windows_.empty()) {
       bounds.x = windows_.back()->view()->bounds().x + 35;
       bounds.y = windows_.back()->view()->bounds().y + 35;
     }
     return CreateWindow(bounds);
   }
 
   Window* CreateWindow(const Rect& bounds) {
     View* content = view_manager_->GetViewById(content_view_id_);
-    View* view = View::Create(view_manager_);
+    View* view = view_manager_->CreateView();
     content->AddChild(view);
     view->SetBounds(bounds);
     view->SetVisible(true);
     view->SetFocus();
     return new Window(this, view);
   }
 
   bool IsDescendantOfKeyboard(View* target) {
     return keyboard_manager_.get() &&
         keyboard_manager_->view()->Contains(target);
   }
 
   Id CreateControlPanel(View* root) {
-    View* view = View::Create(view_manager_);
+    View* view = view_manager_->CreateView();
     root->AddChild(view);
 
     Rect bounds;
     bounds.x = root->bounds().width - kControlPanelWidth - kBorderInset;
     bounds.y = kBorderInset * 2 + kTextfieldHeight;
     bounds.width = kControlPanelWidth;
     bounds.height =
         root->bounds().height - kBorderInset * 3 - kTextfieldHeight;
     view->SetBounds(bounds);
     view->SetVisible(true);
@@ skipping 56 matching lines @@
   window_manager_->RequestNavigate(view_id_, target, request.Pass());
 }
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mojo::examples::WindowManager);
   return runner.Run(shell_handle);
 }