chrome/browser/policy/browser_policy_connector.cc - Issue 10928017: Moving google_apis and GaiaClient to src/google_apis.

Side by Side Diff: chrome/browser/policy/browser_policy_connector.cc

Issue 10928017: Moving google_apis and GaiaClient to src/google_apis. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head Created 8 years, 3 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 | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/policy/browser_policy_connector.h"	5 #include "chrome/browser/policy/browser_policy_connector.h"

6	6

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

8 #include "base/bind_helpers.h"	8 #include "base/bind_helpers.h"

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

10 #include "base/file_path.h"	10 #include "base/file_path.h"

(...skipping 10 matching lines...) Expand all Loading...
21 #include "chrome/browser/policy/managed_mode_policy_provider_factory.h"	21 #include "chrome/browser/policy/managed_mode_policy_provider_factory.h"

22 #include "chrome/browser/policy/policy_service_impl.h"	22 #include "chrome/browser/policy/policy_service_impl.h"

23 #include "chrome/browser/policy/user_cloud_policy_manager.h"	23 #include "chrome/browser/policy/user_cloud_policy_manager.h"

24 #include "chrome/browser/policy/user_policy_cache.h"	24 #include "chrome/browser/policy/user_policy_cache.h"

25 #include "chrome/browser/policy/user_policy_token_cache.h"	25 #include "chrome/browser/policy/user_policy_token_cache.h"

26 #include "chrome/browser/profiles/profile.h"	26 #include "chrome/browser/profiles/profile.h"

27 #include "chrome/browser/signin/token_service.h"	27 #include "chrome/browser/signin/token_service.h"

28 #include "chrome/common/chrome_notification_types.h"	28 #include "chrome/common/chrome_notification_types.h"

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

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

31 #include "chrome/common/net/gaia/gaia_auth_util.h"

32 #include "chrome/common/net/gaia/gaia_constants.h"

33 #include "chrome/common/pref_names.h"	31 #include "chrome/common/pref_names.h"

34 #include "content/public/browser/notification_details.h"	32 #include "content/public/browser/notification_details.h"

35 #include "content/public/browser/notification_source.h"	33 #include "content/public/browser/notification_source.h"

	34 #include "google_apis/gaia/gaia_auth_util.h"

	35 #include "google_apis/gaia/gaia_constants.h"

36 #include "grit/generated_resources.h"	36 #include "grit/generated_resources.h"

37 #include "policy/policy_constants.h"	37 #include "policy/policy_constants.h"

38	38

39 #if defined(OS_WIN)	39 #if defined(OS_WIN)

40 #include "chrome/browser/policy/policy_loader_win.h"	40 #include "chrome/browser/policy/policy_loader_win.h"

41 #elif defined(OS_MACOSX)	41 #elif defined(OS_MACOSX)

42 #include "chrome/browser/policy/policy_loader_mac.h"	42 #include "chrome/browser/policy/policy_loader_mac.h"

43 #include "chrome/browser/preferences_mac.h"	43 #include "chrome/browser/preferences_mac.h"

44 #elif defined(OS_POSIX)	44 #elif defined(OS_POSIX)

45 #include "chrome/browser/policy/config_dir_policy_loader.h"	45 #include "chrome/browser/policy/config_dir_policy_loader.h"

(...skipping 594 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
640 return new AsyncPolicyProvider(loader.Pass());	640 return new AsyncPolicyProvider(loader.Pass());

641 } else {	641 } else {

642 return NULL;	642 return NULL;

643 }	643 }

644 #else	644 #else

645 return NULL;	645 return NULL;

646 #endif	646 #endif

647 }	647 }

648	648

649 } // namespace policy	649 } // namespace policy

OLD	NEW