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

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

Issue 2797743002: ash: Merge LoginStatus update code path (Closed)
Patch Set: for #2 comments Created 3 years, 8 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.cc ('k') | ash/shell/example_session_controller_client.cc » ('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 b61ace578a911b741cbeaf7587a17849109beef6..ab54ee884d84edb005c140209330ccd11111f60a 100644
--- a/ash/shell/content/client/shell_browser_main_parts.cc
+++ b/ash/shell/content/client/shell_browser_main_parts.cc
@@ -133,16 +133,13 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
ash::Shell::CreateInstance(init_params);
- // Initialize session controller client and create fake sessions before
- // creating shelf.
+ // Initialize session controller client and create fake user sessions. The
+ // fake user sessions makes ash into the logged in state.
example_session_controller_client_ =
base::MakeUnique<ExampleSessionControllerClient>(
Shell::Get()->session_controller());
example_session_controller_client_->Initialize();
- ash::Shell::Get()->CreateShelfView();
- ash::Shell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER);
-
window_watcher_.reset(new ash::shell::WindowWatcher);
display::Screen::GetScreen()->AddObserver(window_watcher_.get());
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/example_session_controller_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698