Send size to NativeViewportClient::OnCreated instead of GLES2Client::DidCreateContext

mojo/examples/aura_demo/root_window_host_mojo.h

 // Copyright (c) 2013 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.
 
 #ifndef MOJO_EXAMPLES_AURA_DEMO_ROOT_WINDOW_HOST_MOJO_H_
 #define MOJO_EXAMPLES_AURA_DEMO_ROOT_WINDOW_HOST_MOJO_H_
 
 #include "base/bind.h"
 #include "mojo/public/bindings/lib/remote_ptr.h"
 #include "mojom/native_viewport.h"
 #include "ui/aura/window_tree_host.h"
+#include "ui/gfx/size.h"
 
 namespace ui {
 class ContextFactory;
 }
 
 namespace mojo {
 namespace examples {
 
 class GLES2ClientImpl;
 
@@ skipping 24 matching lines @@
   virtual bool QueryMouseLocation(gfx::Point* location_return) OVERRIDE;
   virtual bool ConfineCursorToRootWindow() OVERRIDE;
   virtual void UnConfineCursor() OVERRIDE;
   virtual void OnCursorVisibilityChanged(bool show) OVERRIDE;
   virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE;
   virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
   virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
   virtual void PrepareForShutdown() OVERRIDE;
 
   // Overridden from NativeViewportClient:
-  virtual void OnCreated() OVERRIDE;
+  virtual void OnCreated(uint32_t width, uint32_t height) MOJO_OVERRIDE;
   virtual void OnDestroyed() OVERRIDE;
   virtual void OnEvent(const Event& event) OVERRIDE;
 
-  void DidCreateContext(gfx::Size size);
+  void DidCreateContext();
+  void MaybeCreateCompositor();
 
   static ui::ContextFactory* context_factory_;
 
+  gfx::Size viewport_size_;
   scoped_ptr<GLES2ClientImpl> gles2_client_;
+  bool context_created_;
   RemotePtr<NativeViewport> native_viewport_;
   base::Callback<void()> compositor_created_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMojo);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 #endif  // MOJO_EXAMPLES_AURA_DEMO_ROOT_WINDOW_HOST_MOJO_H_