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

Side by Side Diff: chrome/browser/chromeos/login/screens/error_screen.cc

Issue 2438063002: user_manager: Remove deps on session_manager (Closed)
Patch Set: fix nits in PS1 Created 4 years, 2 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 (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 "chrome/browser/chromeos/login/screens/error_screen.h" 5 #include "chrome/browser/chromeos/login/screens/error_screen.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 17 matching lines...) Expand all
28 #include "chrome/browser/profiles/profile_manager.h" 28 #include "chrome/browser/profiles/profile_manager.h"
29 #include "chrome/browser/ui/extensions/app_launch_params.h" 29 #include "chrome/browser/ui/extensions/app_launch_params.h"
30 #include "chrome/browser/ui/extensions/application_launch.h" 30 #include "chrome/browser/ui/extensions/application_launch.h"
31 #include "chrome/common/extensions/extension_constants.h" 31 #include "chrome/common/extensions/extension_constants.h"
32 #include "chrome/grit/browser_resources.h" 32 #include "chrome/grit/browser_resources.h"
33 #include "chromeos/dbus/dbus_thread_manager.h" 33 #include "chromeos/dbus/dbus_thread_manager.h"
34 #include "chromeos/dbus/power_manager_client.h" 34 #include "chromeos/dbus/power_manager_client.h"
35 #include "chromeos/dbus/session_manager_client.h" 35 #include "chromeos/dbus/session_manager_client.h"
36 #include "chromeos/network/portal_detector/network_portal_detector.h" 36 #include "chromeos/network/portal_detector/network_portal_detector.h"
37 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h" 37 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h"
38 #include "components/user_manager/user_manager.h" 38 #include "components/session_manager/core/session_manager.h"
39 #include "content/public/browser/notification_service.h" 39 #include "content/public/browser/notification_service.h"
40 #include "extensions/browser/extension_system.h" 40 #include "extensions/browser/extension_system.h"
41 #include "extensions/common/constants.h" 41 #include "extensions/common/constants.h"
42 #include "ui/gfx/native_widget_types.h" 42 #include "ui/gfx/native_widget_types.h"
43 43
44 namespace chromeos { 44 namespace chromeos {
45 45
46 namespace { 46 namespace {
47 47
48 // Returns the current running kiosk app profile in a kiosk session. Otherwise, 48 // Returns the current running kiosk app profile in a kiosk session. Otherwise,
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, 276 IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST,
277 base::FilePath(extension_misc::kConnectivityDiagnosticsPath)); 277 base::FilePath(extension_misc::kConnectivityDiagnosticsPath));
278 278
279 const extensions::Extension* extension = 279 const extensions::Extension* extension =
280 extension_service->GetExtensionById(extension_id, true); 280 extension_service->GetExtensionById(extension_id, true);
281 OpenApplication(AppLaunchParams( 281 OpenApplication(AppLaunchParams(
282 profile, extension, extensions::LAUNCH_CONTAINER_WINDOW, 282 profile, extension, extensions::LAUNCH_CONTAINER_WINDOW,
283 WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL)); 283 WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL));
284 KioskAppManager::Get()->InitSession(profile, extension_id); 284 KioskAppManager::Get()->InitSession(profile, extension_id);
285 285
286 user_manager::UserManager::Get()->SessionStarted(); 286 session_manager::SessionManager::Get()->SessionStarted();
287 287
288 LoginDisplayHost::default_host()->Finalize(); 288 LoginDisplayHost::default_host()->Finalize();
289 } 289 }
290 290
291 void ErrorScreen::OnLaunchOobeGuestSession() { 291 void ErrorScreen::OnLaunchOobeGuestSession() {
292 DeviceSettingsService::Get()->GetOwnershipStatusAsync( 292 DeviceSettingsService::Get()->GetOwnershipStatusAsync(
293 base::Bind(&ErrorScreen::StartGuestSessionAfterOwnershipCheck, 293 base::Bind(&ErrorScreen::StartGuestSessionAfterOwnershipCheck,
294 weak_factory_.GetWeakPtr())); 294 weak_factory_.GetWeakPtr()));
295 } 295 }
296 296
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 } 337 }
338 338
339 if (guest_login_performer_) 339 if (guest_login_performer_)
340 return; 340 return;
341 341
342 guest_login_performer_.reset(new ChromeLoginPerformer(this)); 342 guest_login_performer_.reset(new ChromeLoginPerformer(this));
343 guest_login_performer_->LoginOffTheRecord(); 343 guest_login_performer_->LoginOffTheRecord();
344 } 344 }
345 345
346 } // namespace chromeos 346 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698