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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

Issue 1618193003: arc: Pass auth token from Chrome to ARC instance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update BUILD.gn Created 4 years, 11 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 | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
index 08d97c4840d018315e2f5821d396679b7314ae18..23090c5d45de99166f9cda192c7496a6da6d1ff0 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
@@ -37,8 +37,6 @@
#include "chrome/browser/ui/browser_window.h"
#include "chrome/grit/generated_resources.h"
#include "chromeos/chromeos_switches.h"
-#include "components/arc/arc_bridge_service.h"
-#include "components/arc/arc_service_manager.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/user_metrics.h"
#include "ui/aura/window.h"
@@ -231,18 +229,12 @@ void ChromeShellDelegate::PreInit() {
display_configuration_observer_.reset(
new chromeos::DisplayConfigurationObserver());
- arc_session_observer_.reset(new ArcSessionObserver);
-
chrome_user_metrics_recorder_.reset(new ChromeUserMetricsRecorder);
}
void ChromeShellDelegate::PreShutdown() {
display_configuration_observer_.reset();
- // Remove the ARC observer now since it uses the ash::Shell instance in its
- // destructor, which is unavailable after PreShutdown() returns.
- arc_session_observer_.reset();
-
chrome_user_metrics_recorder_.reset();
}
@@ -310,35 +302,3 @@ void ChromeShellDelegate::PlatformInit() {
chrome::NOTIFICATION_SESSION_STARTED,
content::NotificationService::AllSources());
}
-
-ChromeShellDelegate::ArcSessionObserver::ArcSessionObserver() {
- ash::Shell::GetInstance()->AddShellObserver(this);
-}
-
-ChromeShellDelegate::ArcSessionObserver::~ArcSessionObserver() {
- ash::Shell::GetInstance()->RemoveShellObserver(this);
-}
-
-void ChromeShellDelegate::ArcSessionObserver::OnLoginStateChanged(
- ash::user::LoginStatus status) {
- switch (status) {
- case ash::user::LOGGED_IN_LOCKED:
- case ash::user::LOGGED_IN_KIOSK_APP:
- return;
-
- case ash::user::LOGGED_IN_NONE:
- arc::ArcServiceManager::Get()->arc_bridge_service()->Shutdown();
- break;
-
- case ash::user::LOGGED_IN_USER:
- case ash::user::LOGGED_IN_OWNER:
- case ash::user::LOGGED_IN_GUEST:
- case ash::user::LOGGED_IN_PUBLIC:
- case ash::user::LOGGED_IN_SUPERVISED:
- if (arc::ArcBridgeService::GetEnabled(
- base::CommandLine::ForCurrentProcess())) {
- arc::ArcServiceManager::Get()->arc_bridge_service()->HandleStartup();
- }
- break;
- }
-}
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698