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

Unified Diff: ash/shell/content/client/shell_browser_main_parts.cc

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase to get WorkspaceLayoutManagerSoloTest change Created 3 years, 9 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/content/client/shell_browser_main_parts.h ('k') | ash/shell/example_session_controller_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/content/client/shell_browser_main_parts.cc
diff --git a/ash/shell/content/client/shell_browser_main_parts.cc b/ash/shell/content/client/shell_browser_main_parts.cc
index e5a807b1518088c6c16af1cbb282d07fa6d65fe1..a5183b504d9e4aea6b31dfafb8f2e229fff9b66e 100644
--- a/ash/shell/content/client/shell_browser_main_parts.cc
+++ b/ash/shell/content/client/shell_browser_main_parts.cc
@@ -10,6 +10,7 @@
#include "ash/shell.h"
#include "ash/shell/content/shell_content_state_impl.h"
#include "ash/shell/example_app_list_presenter.h"
+#include "ash/shell/example_session_controller_client.h"
#include "ash/shell/shell_delegate_impl.h"
#include "ash/shell/window_watcher.h"
#include "ash/shell_init_params.h"
@@ -131,6 +132,14 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
init_params.context_factory_private = content::GetContextFactoryPrivate();
init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
ash::Shell::CreateInstance(init_params);
+
+ // Initialize session controller client and create fake sessions before
+ // creating shelf.
+ example_session_controller_client_ =
+ base::MakeUnique<ExampleSessionControllerClient>(
+ WmShell::Get()->session_controller());
+ example_session_controller_client_->Initialize();
+
ash::WmShell::Get()->CreateShelfView();
ash::WmShell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER);
« no previous file with comments | « ash/shell/content/client/shell_browser_main_parts.h ('k') | ash/shell/example_session_controller_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698