Ozone keyboard layout

ui/events/ozone/layout/keyboard_layout_engine_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 "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
+
+#include "base/logging.h"
+#include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
+
+namespace ui {
+
+// static
+KeyboardLayoutEngineManager* KeyboardLayoutEngineManager::instance_ = nullptr;

[Wez, 2014/12/09 07:00:33]

Seems that this needs to be a leaky singleton scoped_ptr?

Does the manager do anything other than contain the global layout engine? If not
then can we replace this class with a pair of set/get APIs back by a singleton?

[kpschoedel, 2014/12/09 19:58:44]

Intended after the TODO at line 33 below is done. This CL is explicitly part of
a series of incremental steps.

[Wez, 2014/12/12 20:04:17]

OK; in general it's best to leave comments referring to the bug # that describes
the work in these interim CLs - more lines-per-CL of churn, but at least if you
get stalled then the state of the code is obvious to the reader.

[kpschoedel, 2014/12/12 21:20:39]

Done.

+
+KeyboardLayoutEngineManager::KeyboardLayoutEngineManager(
+    KeyboardLayoutEngine* engine)
+    : keyboard_layout_engine_(engine) {
+  CHECK(!instance_) << "Only one keyboard layout manager can be created.";
+  instance_ = this;
+}
+
+KeyboardLayoutEngineManager::~KeyboardLayoutEngineManager() {
+  CHECK_EQ(this, instance_);
+  instance_ = NULL;
+}
+
+void KeyboardLayoutEngineManager::Create(
+    scoped_ptr<KeyboardLayoutEngine> engine) {
+  new KeyboardLayoutEngineManager(engine.release());
+}
+
+KeyboardLayoutEngine* KeyboardLayoutEngineManager::GetKeyboardLayoutEngine() {
+  // TODO(kpschoedel): Initialize KLEM in tests and remove lazy initialization.
+  if (!instance_)
+    new KeyboardLayoutEngineManager(new StubKeyboardLayoutEngine());
+  return instance_->keyboard_layout_engine_.get();
+}
+
+}  // namespace ui