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

Unified Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2150023002: Add ShellDelegate, MediaDelegate and KeyboardUI stubs to mus ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 4 years, 5 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/bridge/wm_shell_mus.h ('k') | ash/mus/root_window_controller.cc » ('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 b9626529759b2ad657d98e7bc909056ddf7d29fb..159124b285d49d258398ab9b49f67360d5400f54 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -4,9 +4,13 @@
#include "ash/mus/bridge/wm_shell_mus.h"
+#include <utility>
+
#include "ash/common/default_accessibility_delegate.h"
#include "ash/common/display/display_info.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"
#include "ash/common/shell_window_ids.h"
#include "ash/common/system/tray/default_system_tray_delegate.h"
@@ -119,10 +123,10 @@ class AccessibilityDelegateMus : public DefaultAccessibilityDelegate {
} // namespace
-WmShellMus::WmShellMus(ShellDelegate* delegate,
+WmShellMus::WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
::ui::WindowTreeClient* client,
shell::Connector* connector)
- : WmShell(delegate),
+ : WmShell(std::move(shell_delegate)),
client_(client),
connector_(connector),
session_state_delegate_(new SessionStateDelegateStub) {
@@ -134,7 +138,11 @@ WmShellMus::WmShellMus(ShellDelegate* delegate,
CreateMruWindowTracker();
accessibility_delegate_.reset(new AccessibilityDelegateMus(connector_));
+ SetMediaDelegate(base::WrapUnique(delegate()->CreateMediaDelegate()));
SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate));
+
+ // TODO(jamescook): Port ash::sysui::KeyboardUIMus and use it here.
+ SetKeyboardUI(KeyboardUI::Create());
}
WmShellMus::~WmShellMus() {
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/mus/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698