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

Side by Side Diff: ash/sysui/sysui_application.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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/sysui/sysui_application.h" 5 #include "ash/sysui/sysui_application.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 244
245 ShellInitParams init_params; 245 ShellInitParams init_params;
246 init_params.delegate = ash_delegate_; 246 init_params.delegate = ash_delegate_;
247 init_params.context_factory = new StubContextFactory; 247 init_params.context_factory = new StubContextFactory;
248 init_params.blocking_pool = worker_pool_.get(); 248 init_params.blocking_pool = worker_pool_.get();
249 init_params.in_mus = true; 249 init_params.in_mus = true;
250 init_params.keyboard_factory = 250 init_params.keyboard_factory =
251 base::Bind(&KeyboardUIMus::Create, connector); 251 base::Bind(&KeyboardUIMus::Create, connector);
252 Shell::CreateInstance(init_params); 252 Shell::CreateInstance(init_params);
253 Shell::GetInstance()->CreateShelf(); 253 Shell::GetInstance()->CreateShelf();
254 Shell::GetInstance()->UpdateAfterLoginStatusChange(user::LOGGED_IN_USER); 254 Shell::GetInstance()->UpdateAfterLoginStatusChange(LoginStatus::USER);
255 255
256 Shell::GetPrimaryRootWindow()->GetHost()->Show(); 256 Shell::GetPrimaryRootWindow()->GetHost()->Show();
257 } 257 }
258 258
259 void InitializeResourceBundle(::shell::Connector* connector) { 259 void InitializeResourceBundle(::shell::Connector* connector) {
260 if (ui::ResourceBundle::HasSharedInstance()) 260 if (ui::ResourceBundle::HasSharedInstance())
261 return; 261 return;
262 262
263 std::set<std::string> resource_paths; 263 std::set<std::string> resource_paths;
264 resource_paths.insert(kResourceFileStrings); 264 resource_paths.insert(kResourceFileStrings);
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 mojom::WallpaperControllerRequest request) { 335 mojom::WallpaperControllerRequest request) {
336 mojom::WallpaperController* wallpaper_controller = 336 mojom::WallpaperController* wallpaper_controller =
337 static_cast<UserWallpaperDelegateMus*>( 337 static_cast<UserWallpaperDelegateMus*>(
338 Shell::GetInstance()->user_wallpaper_delegate()); 338 Shell::GetInstance()->user_wallpaper_delegate());
339 wallpaper_controller_bindings_.AddBinding(wallpaper_controller, 339 wallpaper_controller_bindings_.AddBinding(wallpaper_controller,
340 std::move(request)); 340 std::move(request));
341 } 341 }
342 342
343 } // namespace sysui 343 } // namespace sysui
344 } // namespace ash 344 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/web_notification/web_notification_tray_unittest.cc ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698