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

Unified Diff: ash/shell.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/shell.h ('k') | ash/shell/shell_delegate_impl.h » ('j') | 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 92616f6d1a2ee8cfdd554ffccaeaa5557eaab005..105da0f126906b881e63b6438f00c616528a1d6a 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -54,7 +54,6 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/session/session_controller.h"
-#include "ash/session/session_state_delegate.h"
#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_controller.h"
#include "ash/shelf/shelf_model.h"
@@ -1041,7 +1040,6 @@ void Shell::Init(const ShellInitParams& init_params) {
event_client_.reset(new EventClientImpl);
- session_state_delegate_.reset(shell_delegate_->CreateSessionStateDelegate());
// Must occur after Shell has installed its early pre-target handlers (for
// example, WindowModalityController).
shell_port_->CreatePointerWatcherAdapter();
« no previous file with comments | « ash/shell.h ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698