chrome/browser/supervised_user/supervised_user_service.cc - Issue 1412813003: This CL replaces user_manager::UserID with AccountId.

Side by Side Diff: chrome/browser/supervised_user/supervised_user_service.cc

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Rebased. 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 unified diff | Download patch

« chrome/browser/signin/easy_unlock_service.cc ('K') | « chrome/browser/supervised_user/chromeos/manager_password_service.cc ('k') | chrome/browser/sync/sync_ui_util.cc » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/supervised_user/supervised_user_service.h"	5 #include "chrome/browser/supervised_user/supervised_user_service.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/files/file_path.h"	8 #include "base/files/file_path.h"

9 #include "base/files/file_util.h"	9 #include "base/files/file_util.h"

10 #include "base/memory/ref_counted.h"	10 #include "base/memory/ref_counted.h"

(...skipping 21 matching lines...) Expand all Loading...
32 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h"	32 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h"

33 #include "chrome/browser/sync/profile_sync_service.h"	33 #include "chrome/browser/sync/profile_sync_service.h"

34 #include "chrome/browser/sync/profile_sync_service_factory.h"	34 #include "chrome/browser/sync/profile_sync_service_factory.h"

35 #include "chrome/browser/ui/browser.h"	35 #include "chrome/browser/ui/browser.h"

36 #include "chrome/browser/ui/browser_list.h"	36 #include "chrome/browser/ui/browser_list.h"

37 #include "chrome/common/chrome_paths.h"	37 #include "chrome/common/chrome_paths.h"

38 #include "chrome/common/chrome_switches.h"	38 #include "chrome/common/chrome_switches.h"

39 #include "chrome/common/pref_names.h"	39 #include "chrome/common/pref_names.h"

40 #include "chrome/grit/generated_resources.h"	40 #include "chrome/grit/generated_resources.h"

41 #include "components/pref_registry/pref_registry_syncable.h"	41 #include "components/pref_registry/pref_registry_syncable.h"

	42 #include "components/signin/core/account_id/account_id.h"
	achuithb 2015/10/23 00:08:51 Why is this necessary? Why is this necessary? Alexander Alekseev 2015/10/23 09:11:23 This include was temporary. I removed it. Show quoted text On 2015/10/23 00:08:51, achuithb wrote: > Why is this necessary? This include was temporary. I removed it.
42 #include "components/signin/core/browser/profile_oauth2_token_service.h"	43 #include "components/signin/core/browser/profile_oauth2_token_service.h"

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

44 #include "components/signin/core/browser/signin_manager_base.h"	45 #include "components/signin/core/browser/signin_manager_base.h"

45 #include "components/signin/core/common/signin_switches.h"	46 #include "components/signin/core/common/signin_switches.h"

46 #include "content/public/browser/browser_thread.h"	47 #include "content/public/browser/browser_thread.h"

47 #include "content/public/browser/user_metrics.h"	48 #include "content/public/browser/user_metrics.h"

48 #include "ui/base/l10n/l10n_util.h"	49 #include "ui/base/l10n/l10n_util.h"

49	50

50 #if !defined(OS_ANDROID) && !defined(OS_IOS)	51 #if !defined(OS_ANDROID) && !defined(OS_IOS)

51 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice.h"	52 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice.h"

(...skipping 943 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
995	996

996 is_profile_active_ = profile_became_active;	997 is_profile_active_ = profile_became_active;

997 }	998 }

998 #endif // !defined(OS_ANDROID) && !defined(OS_IOS)	999 #endif // !defined(OS_ANDROID) && !defined(OS_IOS)

999	1000

1000 void SupervisedUserService::OnSiteListUpdated() {	1001 void SupervisedUserService::OnSiteListUpdated() {

1001 FOR_EACH_OBSERVER(	1002 FOR_EACH_OBSERVER(

1002 SupervisedUserServiceObserver, observer_list_, OnURLFilterChanged());	1003 SupervisedUserServiceObserver, observer_list_, OnURLFilterChanged());

1003 }	1004 }

1004	1005

OLD	NEW