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

Unified Diff: ash/common/wm_shell.cc

Issue 2434463004: mash: Move directly linked NewWindowDelegate to mojom::NewWindowClient. (Closed)
Patch Set: Rebase to ToT Created 4 years, 2 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/common/wm_shell.h ('k') | ash/display/display_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_shell.cc
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc
index d5c49e3bfa97db1d102250991fca9123ff40d62f..c2e7cf2f8e848d123d5108191b0b8a0c13b3ad1f 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -11,7 +11,7 @@
#include "ash/common/accessibility_delegate.h"
#include "ash/common/focus_cycler.h"
#include "ash/common/keyboard/keyboard_ui.h"
-#include "ash/common/new_window_delegate.h"
+#include "ash/common/new_window_client_proxy.h"
#include "ash/common/palette_delegate.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shelf/app_list_shelf_item_delegate.h"
@@ -84,8 +84,6 @@ void WmShell::Initialize(const scoped_refptr<base::SequencedWorkerPool>& pool) {
// Shelf, and WallPaper could be created by the factory.
views::FocusManagerFactory::Install(new AshFocusManagerFactory);
- new_window_delegate_.reset(delegate_->CreateNewWindowDelegate());
-
wallpaper_controller_.reset(new WallpaperController(blocking_pool_));
}
@@ -236,6 +234,8 @@ WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)
immersive_context_(base::MakeUnique<ImmersiveContextAsh>()),
locale_notification_controller_(
base::MakeUnique<LocaleNotificationController>()),
+ new_window_client_(base::MakeUnique<NewWindowClientProxy>(
+ delegate_->GetShellConnector())),
shelf_controller_(base::MakeUnique<ShelfController>()),
system_tray_controller_(base::MakeUnique<SystemTrayController>(
delegate_->GetShellConnector())),
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/display/display_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698