Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2202)

Unified Diff: ash/mus/keyboard_ui_mus.cc

Issue 2339633002: mash: Port KeyboardUIMus to mojo:ash; remove sysui. (Closed)
Patch Set: Add mash NOTIMPLEMENTED() in AccessibilityManager::UpdateVirtualKeyboardFromPref() Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/keyboard_ui_mus.h ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/keyboard_ui_mus.cc
diff --git a/ash/sysui/keyboard_ui_mus.cc b/ash/mus/keyboard_ui_mus.cc
similarity index 78%
rename from ash/sysui/keyboard_ui_mus.cc
rename to ash/mus/keyboard_ui_mus.cc
index 6b859a99e0def20029a47e2f62e2c1cc2f972f1d..a2255897dda1cb2c64732ad6a88d128c7655c74c 100644
--- a/ash/sysui/keyboard_ui_mus.cc
+++ b/ash/mus/keyboard_ui_mus.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/sysui/keyboard_ui_mus.h"
+#include "ash/mus/keyboard_ui_mus.h"
#include "ash/common/keyboard/keyboard_ui_observer.h"
#include "base/memory/ptr_util.h"
@@ -12,9 +12,11 @@ namespace ash {
KeyboardUIMus::KeyboardUIMus(::shell::Connector* connector)
: is_enabled_(false), observer_binding_(this) {
- // TODO(sky): should be something like mojo:keyboard, but need mapping.
- connector->ConnectToInterface("exe:chrome", &keyboard_);
- keyboard_->AddObserver(observer_binding_.CreateInterfacePtrAndBind());
+ if (connector) {
+ // TODO(sky): should be something like mojo:keyboard, but need mapping.
+ connector->ConnectToInterface("exe:chrome", &keyboard_);
+ keyboard_->AddObserver(observer_binding_.CreateInterfacePtrAndBind());
+ }
}
KeyboardUIMus::~KeyboardUIMus() {}
@@ -22,7 +24,7 @@ KeyboardUIMus::~KeyboardUIMus() {}
// static
std::unique_ptr<KeyboardUI> KeyboardUIMus::Create(
::shell::Connector* connector) {
- return base::WrapUnique(new KeyboardUIMus(connector));
+ return base::MakeUnique<KeyboardUIMus>(connector);
}
void KeyboardUIMus::Hide() {
« no previous file with comments | « ash/mus/keyboard_ui_mus.h ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698