| Index: ash/mus/keyboard_ui_mus.cc
|
| diff --git a/ash/mus/keyboard_ui_mus.cc b/ash/mus/keyboard_ui_mus.cc
|
| index f8a1ab7843370bb1961accccdcfc2bd5e8c14522..1a16aae1d1b6d4562d405e123d6e986087f21433 100644
|
| --- a/ash/mus/keyboard_ui_mus.cc
|
| +++ b/ash/mus/keyboard_ui_mus.cc
|
| @@ -7,22 +7,22 @@
|
| #include "ash/keyboard/keyboard_ui_observer.h"
|
| #include "ash/shell.h"
|
| #include "ash/shell_delegate.h"
|
| -#include "mojo/shell/public/cpp/shell.h"
|
| +#include "mojo/shell/public/cpp/connector.h"
|
|
|
| namespace ash {
|
|
|
| -KeyboardUIMus::KeyboardUIMus(mojo::Shell* mojo_shell)
|
| +KeyboardUIMus::KeyboardUIMus(mojo::Connector* connector)
|
| : is_enabled_(false), observer_binding_(this) {
|
| // TODO(sky): should be something like mojo://keyboard, but need mapping.
|
| - mojo_shell->ConnectToInterface("exe://chrome", &keyboard_);
|
| + connector->ConnectToInterface("exe://chrome", &keyboard_);
|
| keyboard_->AddObserver(observer_binding_.CreateInterfacePtrAndBind());
|
| }
|
|
|
| KeyboardUIMus::~KeyboardUIMus() {}
|
|
|
| // static
|
| -scoped_ptr<KeyboardUI> KeyboardUIMus::Create(mojo::Shell* mojo_shell) {
|
| - return make_scoped_ptr(new KeyboardUIMus(mojo_shell));
|
| +scoped_ptr<KeyboardUI> KeyboardUIMus::Create(mojo::Connector* connector) {
|
| + return make_scoped_ptr(new KeyboardUIMus(connector));
|
| }
|
|
|
| void KeyboardUIMus::Hide() {
|
|
|