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

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

Issue 1496193002: arc: Add ArcServiceManager to own all future ARC services (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: readded file Created 5 years 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/chromeos/chrome_browser_main_chromeos.cc ('k') | components/arc.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 ef02593ce831284bb86feea74c96f9e68c26e281..ef5c7e8b6a09dad7daae8dea1e0d7e76c782491c 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
@@ -37,6 +37,7 @@
#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"
@@ -325,7 +326,7 @@ void ChromeShellDelegate::ArcSessionObserver::OnLoginStateChanged(
return;
case ash::user::LOGGED_IN_NONE:
- arc::ArcBridgeService::Get()->Shutdown();
+ arc::ArcServiceManager::Get()->arc_bridge_service()->Shutdown();
break;
case ash::user::LOGGED_IN_USER:
@@ -335,7 +336,7 @@ void ChromeShellDelegate::ArcSessionObserver::OnLoginStateChanged(
case ash::user::LOGGED_IN_SUPERVISED:
if (arc::ArcBridgeService::GetEnabled(
base::CommandLine::ForCurrentProcess())) {
- arc::ArcBridgeService::Get()->HandleStartup();
+ arc::ArcServiceManager::Get()->arc_bridge_service()->HandleStartup();
}
break;
}
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | components/arc.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698