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

Side by Side Diff: ash/shell/content/client/shell_browser_main_parts.cc

Issue 2041233005: Moves ash::user::LoginStatus to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « ash/shell.cc ('k') | ash/shell_observer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/shell/content/client/shell_browser_main_parts.h" 5 #include "ash/shell/content/client/shell_browser_main_parts.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/content/shell_content_state.h" 8 #include "ash/content/shell_content_state.h"
9 #include "ash/desktop_background/desktop_background_controller.h" 9 #include "ash/desktop_background/desktop_background_controller.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 128
129 ShellContentState::SetInstance( 129 ShellContentState::SetInstance(
130 new ShellContentStateImpl(browser_context_.get())); 130 new ShellContentStateImpl(browser_context_.get()));
131 ui::MaterialDesignController::Initialize(); 131 ui::MaterialDesignController::Initialize();
132 ash::ShellInitParams init_params; 132 ash::ShellInitParams init_params;
133 init_params.delegate = delegate_; 133 init_params.delegate = delegate_;
134 init_params.context_factory = content::GetContextFactory(); 134 init_params.context_factory = content::GetContextFactory();
135 init_params.blocking_pool = content::BrowserThread::GetBlockingPool(); 135 init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
136 ash::Shell::CreateInstance(init_params); 136 ash::Shell::CreateInstance(init_params);
137 ash::Shell::GetInstance()->CreateShelf(); 137 ash::Shell::GetInstance()->CreateShelf();
138 ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(user::LOGGED_IN_USER); 138 ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(LoginStatus::USER);
139 139
140 window_watcher_.reset(new ash::shell::WindowWatcher); 140 window_watcher_.reset(new ash::shell::WindowWatcher);
141 display::Screen::GetScreen()->AddObserver(window_watcher_.get()); 141 display::Screen::GetScreen()->AddObserver(window_watcher_.get());
142 142
143 ash::shell::InitWindowTypeLauncher(); 143 ash::shell::InitWindowTypeLauncher();
144 144
145 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show(); 145 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
146 } 146 }
147 147
148 void ShellBrowserMainParts::PostMainMessageLoopRun() { 148 void ShellBrowserMainParts::PostMainMessageLoopRun() {
(...skipping 20 matching lines...) Expand all
169 browser_context_.reset(); 169 browser_context_.reset();
170 } 170 }
171 171
172 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { 172 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
173 base::MessageLoop::current()->Run(); 173 base::MessageLoop::current()->Run();
174 return true; 174 return true;
175 } 175 }
176 176
177 } // namespace shell 177 } // namespace shell
178 } // namespace ash 178 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | ash/shell_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698