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

Unified Diff: ash/mus/bridge/wm_shell_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/BUILD.gn ('k') | ash/mus/keyboard_ui_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.cc
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
index 456528afc1888848a738b0445aa88f2ef63638a0..b773b7f6f0ca8c8194e1710a4cc82fc19251f928 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -7,7 +7,6 @@
#include <utility>
#include "ash/common/accelerators/accelerator_controller.h"
-#include "ash/common/keyboard/keyboard_ui.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shell_delegate.h"
#include "ash/common/shell_observer.h"
@@ -28,6 +27,7 @@
#include "ash/mus/bridge/workspace_event_handler_mus.h"
#include "ash/mus/container_ids.h"
#include "ash/mus/drag_window_resizer.h"
+#include "ash/mus/keyboard_ui_mus.h"
#include "ash/mus/root_window_controller.h"
#include "ash/mus/window_manager.h"
#include "ash/shared/immersive_fullscreen_controller.h"
@@ -135,10 +135,9 @@ WmShellMus::WmShellMus(
CreateMruWindowTracker();
- SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate));
+ SetSystemTrayDelegate(base::MakeUnique<DefaultSystemTrayDelegate>());
- // TODO(jamescook): Port ash::sysui::KeyboardUIMus and use it here.
- SetKeyboardUI(KeyboardUI::Create());
+ SetKeyboardUI(KeyboardUIMus::Create(window_manager_->connector()));
wallpaper_delegate()->InitializeWallpaper();
}
« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/keyboard_ui_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698