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

Unified Diff: ash/mus/window_manager.cc

Issue 2910773002: cros: CustomFrameViewAsh avatar icon from a window prop (Closed)
Patch Set: add test Created 3 years, 7 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.h ('k') | ash/session/session_state_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager.cc
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index 08d115ca611e820a7ef56f23d6da32552eeaee50..d90c7a1d2f67ab0a5ab561a586aa92f56b58096d 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -6,6 +6,7 @@
#include <stdint.h>
+#include <limits>
#include <utility>
#include "ash/drag_drop/drag_image_view.h"
@@ -229,8 +230,7 @@ void WindowManager::CreateShell(
ShellInitParams init_params;
ShellPortMash* shell_port =
new ShellPortMash(window_tree_host ? window_tree_host->window() : nullptr,
- this, pointer_watcher_event_router_.get(),
- create_session_state_delegate_stub_for_test_);
+ this, pointer_watcher_event_router_.get());
// Shell::CreateInstance() takes ownership of ShellDelegate.
init_params.delegate = shell_delegate_ ? shell_delegate_.release()
: new ShellDelegateMus(connector_);
« no previous file with comments | « ash/mus/window_manager.h ('k') | ash/session/session_state_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698