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

Unified Diff: ash/shell.cc

Issue 2144363003: Create ash media delegate earlier during ash shell initialization (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shelldelegates
Patch Set: rebase 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/window_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index b125026a023ffa6df99bcc96acd7f8af20541ce2..7cd6cf1fd51470b38bd27feea6d0f1111da3521c 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -806,6 +806,8 @@ Shell::~Shell() {
}
void Shell::Init(const ShellInitParams& init_params) {
+ wm_shell_->Initialize();
+
in_mus_ = init_params.in_mus;
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -1017,8 +1019,6 @@ void Shell::Init(const ShellInitParams& init_params) {
accessibility_delegate_.reset(
wm_shell_->delegate()->CreateAccessibilityDelegate());
new_window_delegate_.reset(wm_shell_->delegate()->CreateNewWindowDelegate());
- wm_shell_->SetMediaDelegate(
- base::WrapUnique(wm_shell_->delegate()->CreateMediaDelegate()));
pointer_watcher_delegate_ =
wm_shell_->delegate()->CreatePointerWatcherDelegate();
« no previous file with comments | « ash/mus/window_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698