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

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

Issue 11734021: Roll ICU and convert include style to standard Chromium style, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
« no previous file with comments | « chrome/browser/instant/instant_controller.cc ('k') | chrome/browser/signin/signin_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 20 matching lines...) Expand all
31 #include "chrome/common/chrome_notification_types.h" 31 #include "chrome/common/chrome_notification_types.h"
32 #include "chrome/common/chrome_paths.h" 32 #include "chrome/common/chrome_paths.h"
33 #include "chrome/common/chrome_switches.h" 33 #include "chrome/common/chrome_switches.h"
34 #include "chrome/common/pref_names.h" 34 #include "chrome/common/pref_names.h"
35 #include "content/public/browser/notification_details.h" 35 #include "content/public/browser/notification_details.h"
36 #include "content/public/browser/notification_source.h" 36 #include "content/public/browser/notification_source.h"
37 #include "google_apis/gaia/gaia_auth_util.h" 37 #include "google_apis/gaia/gaia_auth_util.h"
38 #include "google_apis/gaia/gaia_constants.h" 38 #include "google_apis/gaia/gaia_constants.h"
39 #include "grit/generated_resources.h" 39 #include "grit/generated_resources.h"
40 #include "policy/policy_constants.h" 40 #include "policy/policy_constants.h"
41 #include "unicode/regex.h" 41 #include "third_party/icu/public/i18n/unicode/regex.h"
42 42
43 #if defined(OS_WIN) 43 #if defined(OS_WIN)
44 #include "chrome/browser/policy/policy_loader_win.h" 44 #include "chrome/browser/policy/policy_loader_win.h"
45 #elif defined(OS_MACOSX) 45 #elif defined(OS_MACOSX)
46 #include "chrome/browser/policy/policy_loader_mac.h" 46 #include "chrome/browser/policy/policy_loader_mac.h"
47 #include "chrome/browser/preferences_mac.h" 47 #include "chrome/browser/preferences_mac.h"
48 #elif defined(OS_POSIX) 48 #elif defined(OS_POSIX)
49 #include "chrome/browser/policy/config_dir_policy_loader.h" 49 #include "chrome/browser/policy/config_dir_policy_loader.h"
50 #endif 50 #endif
51 51
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 return new AsyncPolicyProvider(loader.Pass()); 780 return new AsyncPolicyProvider(loader.Pass());
781 } else { 781 } else {
782 return NULL; 782 return NULL;
783 } 783 }
784 #else 784 #else
785 return NULL; 785 return NULL;
786 #endif 786 #endif
787 } 787 }
788 788
789 } // namespace policy 789 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/instant/instant_controller.cc ('k') | chrome/browser/signin/signin_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698