ozone: Initialize a subsystem only if necessary.

ui/ozone/platform/dri/ozone_platform_dri.cc

 // Copyright 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.
 
 #include "ui/ozone/platform/dri/ozone_platform_dri.h"
 
 #include "ui/events/ozone/device/device_manager.h"
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/ozone/ime/input_method_context_factory_ozone.h"
@@ skipping 15 matching lines @@
 
 // OzonePlatform for Linux DRI (Direct Rendering Infrastructure)
 //
 // This platform is Linux without any display server (no X, wayland, or
 // anything). This means chrome alone owns the display and input devices.
 class OzonePlatformDri : public OzonePlatform {
  public:
   OzonePlatformDri()
       : dri_(new DriWrapper(kDefaultGraphicsCardPath)),
         screen_manager_(new ScreenManager(dri_.get())),
-        device_manager_(CreateDeviceManager()),
-        surface_factory_ozone_(dri_.get(), screen_manager_.get()),
-        cursor_factory_ozone_(&surface_factory_ozone_),
-        event_factory_ozone_(&cursor_factory_ozone_, device_manager_.get()) {}
+        device_manager_(CreateDeviceManager()) {}
   virtual ~OzonePlatformDri() {}
 
   // OzonePlatform:
   virtual gfx::SurfaceFactoryOzone* GetSurfaceFactoryOzone() OVERRIDE {
-    return &surface_factory_ozone_;
+    return surface_factory_ozone_.get();
   }
-  virtual ui::EventFactoryOzone* GetEventFactoryOzone() OVERRIDE {
-    return &event_factory_ozone_;
+  virtual EventFactoryOzone* GetEventFactoryOzone() OVERRIDE {
+    return event_factory_ozone_.get();
   }
-  virtual ui::InputMethodContextFactoryOzone*
-  GetInputMethodContextFactoryOzone() OVERRIDE {
-    return &input_method_context_factory_ozone_;
+  virtual InputMethodContextFactoryOzone* GetInputMethodContextFactoryOzone()
+      OVERRIDE {
+    return input_method_context_factory_ozone_.get();
   }
-  virtual ui::CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE {
-    return &cursor_factory_ozone_;
+  virtual CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE {
+    return cursor_factory_ozone_.get();
   }
 #if defined(OS_CHROMEOS)
-  virtual scoped_ptr<ui::NativeDisplayDelegate> CreateNativeDisplayDelegate()
+  virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate()
       OVERRIDE {
-    return scoped_ptr<ui::NativeDisplayDelegate>(new NativeDisplayDelegateDri(
+    return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateDri(
         dri_.get(), screen_manager_.get(), device_manager_.get()));
   }
 #endif
+  virtual void InitializeUI() OVERRIDE {
+    surface_factory_ozone_.reset(
+        new DriSurfaceFactory(dri_.get(), screen_manager_.get()));
+    cursor_factory_ozone_.reset(
+        new CursorFactoryEvdevDri(surface_factory_ozone_.get()));
+    event_factory_ozone_.reset(new EventFactoryEvdev(
+        cursor_factory_ozone_.get(), device_manager_.get()));
+    input_method_context_factory_ozone_.reset(
+        new InputMethodContextFactoryOzone());
+  }
+
+  virtual void InitializeGPU() OVERRIDE {}
 
  private:
   scoped_ptr<DriWrapper> dri_;
   // TODO(dnicoara) Move ownership of |screen_manager_| to NDD.
   scoped_ptr<ScreenManager> screen_manager_;
   scoped_ptr<DeviceManager> device_manager_;
 
-  ui::DriSurfaceFactory surface_factory_ozone_;
-  ui::CursorFactoryEvdevDri cursor_factory_ozone_;
-  ui::EventFactoryEvdev event_factory_ozone_;
+  scoped_ptr<DriSurfaceFactory> surface_factory_ozone_;
+  scoped_ptr<CursorFactoryEvdevDri> cursor_factory_ozone_;
+  scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
   // This creates a minimal input context.
-  ui::InputMethodContextFactoryOzone input_method_context_factory_ozone_;
+  scoped_ptr<InputMethodContextFactoryOzone>
+      input_method_context_factory_ozone_;
 
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformDri);
 };
 
 }  // namespace
 
 OzonePlatform* CreateOzonePlatformDri() { return new OzonePlatformDri; }
 
 }  // namespace ui