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

Unified Diff: chrome/browser/managed_mode/managed_user_service.cc

Issue 63423003: Set ENABLE_MANAGED_USERS #ifdef on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 7 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
Index: chrome/browser/managed_mode/managed_user_service.cc
diff --git a/chrome/browser/managed_mode/managed_user_service.cc b/chrome/browser/managed_mode/managed_user_service.cc
index c7476c946db7e83fa0dd3096010a9d9cfc2cc405..2fd3df592463e5021abd3f6a2d84371b363e7f2f 100644
--- a/chrome/browser/managed_mode/managed_user_service.cc
+++ b/chrome/browser/managed_mode/managed_user_service.cc
@@ -150,7 +150,11 @@ void ManagedUserService::Shutdown() {
did_shutdown_ = true;
if (ProfileIsManaged()) {
RecordProfileAndBrowserEventsHelper(kQuitBrowserKeyPrefix);
+#if !defined(OS_ANDROID)
+ // TODO(bauerb): Get rid of the platform-specific #ifdef here.
+ // http://crbug.com/313377
BrowserList::RemoveObserver(this);
+#endif
}
if (!waiting_for_sync_initialization_)
@@ -574,7 +578,11 @@ void ManagedUserService::Init() {
base::Bind(&ManagedUserService::UpdateManualURLs,
base::Unretained(this)));
+#if !defined(OS_ANDROID)
+ // TODO(bauerb): Get rid of the platform-specific #ifdef here.
+ // http://crbug.com/313377
BrowserList::AddObserver(this);
+#endif
// Initialize the filter.
OnDefaultFilteringBehaviorChanged();
« no previous file with comments | « chrome/browser/managed_mode/managed_mode_url_filter.cc ('k') | chrome/browser/managed_mode/managed_user_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698