| OLD | NEW |
| 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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 | 243 |
| 244 ShellInitParams init_params; | 244 ShellInitParams init_params; |
| 245 init_params.delegate = ash_delegate_; | 245 init_params.delegate = ash_delegate_; |
| 246 init_params.context_factory = new StubContextFactory; | 246 init_params.context_factory = new StubContextFactory; |
| 247 init_params.blocking_pool = worker_pool_.get(); | 247 init_params.blocking_pool = worker_pool_.get(); |
| 248 init_params.in_mus = true; | 248 init_params.in_mus = true; |
| 249 init_params.keyboard_factory = | 249 init_params.keyboard_factory = |
| 250 base::Bind(&KeyboardUIMus::Create, connector); | 250 base::Bind(&KeyboardUIMus::Create, connector); |
| 251 Shell::CreateInstance(init_params); | 251 Shell::CreateInstance(init_params); |
| 252 Shell::GetInstance()->CreateShelf(); | 252 Shell::GetInstance()->CreateShelf(); |
| 253 Shell::GetInstance()->UpdateAfterLoginStatusChange(user::LOGGED_IN_USER); | 253 Shell::GetInstance()->UpdateAfterLoginStatusChange(LoginStatus::USER); |
| 254 | 254 |
| 255 Shell::GetPrimaryRootWindow()->GetHost()->Show(); | 255 Shell::GetPrimaryRootWindow()->GetHost()->Show(); |
| 256 } | 256 } |
| 257 | 257 |
| 258 void InitializeResourceBundle(::shell::Connector* connector) { | 258 void InitializeResourceBundle(::shell::Connector* connector) { |
| 259 if (ui::ResourceBundle::HasSharedInstance()) | 259 if (ui::ResourceBundle::HasSharedInstance()) |
| 260 return; | 260 return; |
| 261 | 261 |
| 262 std::set<std::string> resource_paths; | 262 std::set<std::string> resource_paths; |
| 263 resource_paths.insert(kResourceFileStrings); | 263 resource_paths.insert(kResourceFileStrings); |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 mojom::WallpaperControllerRequest request) { | 333 mojom::WallpaperControllerRequest request) { |
| 334 mojom::WallpaperController* wallpaper_controller = | 334 mojom::WallpaperController* wallpaper_controller = |
| 335 static_cast<UserWallpaperDelegateMus*>( | 335 static_cast<UserWallpaperDelegateMus*>( |
| 336 Shell::GetInstance()->user_wallpaper_delegate()); | 336 Shell::GetInstance()->user_wallpaper_delegate()); |
| 337 wallpaper_controller_bindings_.AddBinding(wallpaper_controller, | 337 wallpaper_controller_bindings_.AddBinding(wallpaper_controller, |
| 338 std::move(request)); | 338 std::move(request)); |
| 339 } | 339 } |
| 340 | 340 |
| 341 } // namespace sysui | 341 } // namespace sysui |
| 342 } // namespace ash | 342 } // namespace ash |
| OLD | NEW |