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

Unified Diff: ash/mus/keyboard_ui_mus.cc

Issue 2633293005: Converts mash to use Shell (Closed)
Patch Set: cleanup Created 3 years, 11 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
Index: ash/mus/keyboard_ui_mus.cc
diff --git a/ash/mus/keyboard_ui_mus.cc b/ash/mus/keyboard_ui_mus.cc
index 2f745aa61f453a71be29ec38bd0d55ca6d4c6ef0..83c85cb7b6af130d0644f92836762b5496f31d8c 100644
--- a/ash/mus/keyboard_ui_mus.cc
+++ b/ash/mus/keyboard_ui_mus.cc
@@ -29,17 +29,20 @@ std::unique_ptr<KeyboardUI> KeyboardUIMus::Create(
}
void KeyboardUIMus::Hide() {
- keyboard_->Hide();
+ if (keyboard_)
James Cook 2017/01/18 01:00:24 Are these checks for tests, or is this something t
sky 2017/01/18 04:00:07 Only in tests. The constructor may be passed null.
+ keyboard_->Hide();
}
void KeyboardUIMus::Show() {
- keyboard_->Show();
+ if (keyboard_)
+ keyboard_->Show();
}
void KeyboardUIMus::ShowInDisplay(const int64_t display_id) {
// TODO(yhanada): Send display id after adding a display_id argument to
// |Keyboard::Show()| in keyboard.mojom. See crbug.com/585253.
- keyboard_->Show();
+ if (keyboard_)
+ keyboard_->Show();
}
bool KeyboardUIMus::IsEnabled() {

Powered by Google App Engine
This is Rietveld 408576698