| Index: shell/android/keyboard_impl.h
|
| diff --git a/shell/android/keyboard_impl.h b/shell/android/keyboard_impl.h
|
| index e40b7dd46322b49e7198b13947da5e206eb48f8d..f633c6075a755925b813cc983dde77f270674b50 100644
|
| --- a/shell/android/keyboard_impl.h
|
| +++ b/shell/android/keyboard_impl.h
|
| @@ -11,25 +11,23 @@
|
| #include "mojo/public/cpp/bindings/strong_binding.h"
|
| #include "mojo/services/keyboard/public/interfaces/keyboard.mojom.h"
|
|
|
| -namespace mojo {
|
| namespace shell {
|
|
|
| -class KeyboardImpl : public Keyboard {
|
| +class KeyboardImpl : public mojo::Keyboard {
|
| public:
|
| - KeyboardImpl(InterfaceRequest<Keyboard> request);
|
| + explicit KeyboardImpl(mojo::InterfaceRequest<mojo::Keyboard> request);
|
| ~KeyboardImpl();
|
|
|
| - // Keyboard implementation
|
| + // mojo::Keyboard implementation
|
| void Show() override;
|
| void Hide() override;
|
|
|
| private:
|
| - StrongBinding<Keyboard> binding_;
|
| + mojo::StrongBinding<mojo::Keyboard> binding_;
|
| };
|
|
|
| bool RegisterKeyboardJni(JNIEnv* env);
|
|
|
| } // namespace shell
|
| -} // namespace mojo
|
|
|
| #endif // SHELL_ANDROID_KEYBOARD_IMPL_H_
|
|
|