chrome/browser/supervised_user/child_accounts/child_account_service.cc - Issue 1391893003: NOT FOR REVIEW: Aura on Android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/supervised_user/child_accounts/child_account_service.cc

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ssl/connection_security_android.cc ('k') | chrome/browser/supervised_user/supervised_user_interstitial.cc » ('j') | content/browser/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/child_accounts/child_account_service.cc

diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service.cc b/chrome/browser/supervised_user/child_accounts/child_account_service.cc

index f7a813c1ba60883bc2143437ea9ed7d963b2d53b..eb964a1c7ed8c50e57bfb1c1be7c679c59f0816a 100644

--- a/chrome/browser/supervised_user/child_accounts/child_account_service.cc

+++ b/chrome/browser/supervised_user/child_accounts/child_account_service.cc

@@ -27,7 +27,7 @@

#include "components/signin/core/browser/profile_oauth2_token_service.h"

#include "components/signin/core/browser/signin_manager.h"

-#if defined(OS_ANDROID)

+#if defined(OS_ANDROID) && !defined(USE_AURA)

#include "base/android/jni_android.h"

#include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h"

#endif

@@ -124,7 +124,7 @@ void ChildAccountService::Init() {

SupervisedUserServiceFactory::GetForProfile(profile_)->SetDelegate(this);

AccountTrackerServiceFactory::GetForProfile(profile_)->AddObserver(this);

-#if defined(OS_ANDROID)

+#if defined(OS_ANDROID) && !defined(USE_AURA)

bool is_child_account = false;

if (GetJavaChildAccountStatus(&is_child_account))

SetIsChildAccount(is_child_account);