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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2507073002: Split ArcSessionManager from ArcAuthService. (Closed)
Patch Set: Fix rebase mistake Created 4 years, 1 month 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 | « no previous file | chrome/browser/chromeos/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 1cf192126aa7a5bd70bec499808f6f72711e1138..5c20fc0035923a1b364d4acfdbfb1dfc5b0d782f 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -204,7 +204,7 @@
#elif defined(OS_MACOSX)
#include "chrome/browser/chrome_browser_main_mac.h"
#elif defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/arc/arc_auth_service.h"
+#include "chrome/browser/chromeos/arc/arc_session_manager.h"
#include "chrome/browser/chromeos/arc/fileapi/arc_content_file_system_backend_delegate.h"
#include "chrome/browser/chromeos/arc/intent_helper/arc_navigation_throttle.h"
#include "chrome/browser/chromeos/attestation/platform_verification_impl.h"
@@ -3154,8 +3154,9 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
throttles.push_back(MergeSessionNavigationThrottle::Create(handle));
}
- const arc::ArcAuthService* auth_service = arc::ArcAuthService::Get();
- if (auth_service && auth_service->IsArcEnabled() &&
+ const arc::ArcSessionManager* arc_session_manager =
+ arc::ArcSessionManager::Get();
+ if (arc_session_manager && arc_session_manager->IsArcEnabled() &&
!handle->GetWebContents()->GetBrowserContext()->IsOffTheRecord()) {
prerender::PrerenderContents* prerender_contents =
prerender::PrerenderContents::FromWebContents(
« no previous file with comments | « no previous file | chrome/browser/chromeos/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698