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

Side by Side Diff: chrome/browser/profiles/profile_impl.cc

Issue 286933002: [cros login] Split login related classes into subfolders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix includes in new tests Created 6 years, 7 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/prefs/browser_prefs.cc ('k') | chrome/browser/profiles/profile_io_data.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/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 #endif 123 #endif
124 #endif 124 #endif
125 125
126 #if defined(ENABLE_MANAGED_USERS) 126 #if defined(ENABLE_MANAGED_USERS)
127 #include "chrome/browser/managed_mode/managed_user_settings_service.h" 127 #include "chrome/browser/managed_mode/managed_user_settings_service.h"
128 #include "chrome/browser/managed_mode/managed_user_settings_service_factory.h" 128 #include "chrome/browser/managed_mode/managed_user_settings_service_factory.h"
129 #endif 129 #endif
130 130
131 #if defined(OS_CHROMEOS) 131 #if defined(OS_CHROMEOS)
132 #include "chrome/browser/chromeos/locale_change_guard.h" 132 #include "chrome/browser/chromeos/locale_change_guard.h"
133 #include "chrome/browser/chromeos/login/user_manager.h" 133 #include "chrome/browser/chromeos/login/users/user_manager.h"
134 #include "chrome/browser/chromeos/preferences.h" 134 #include "chrome/browser/chromeos/preferences.h"
135 #include "chrome/browser/chromeos/profiles/profile_helper.h" 135 #include "chrome/browser/chromeos/profiles/profile_helper.h"
136 #endif 136 #endif
137 137
138 using base::Time; 138 using base::Time;
139 using base::TimeDelta; 139 using base::TimeDelta;
140 using base::UserMetricsAction; 140 using base::UserMetricsAction;
141 using content::BrowserThread; 141 using content::BrowserThread;
142 using content::DownloadManagerDelegate; 142 using content::DownloadManagerDelegate;
143 using content::HostZoomMap; 143 using content::HostZoomMap;
(...skipping 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after
1357 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { 1357 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() {
1358 #if defined(OS_CHROMEOS) 1358 #if defined(OS_CHROMEOS)
1359 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 1359 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
1360 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 1360 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
1361 g_browser_process->local_state()); 1361 g_browser_process->local_state());
1362 } 1362 }
1363 #endif // defined(OS_CHROMEOS) 1363 #endif // defined(OS_CHROMEOS)
1364 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 1364 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
1365 GetPrefs(), g_browser_process->local_state()); 1365 GetPrefs(), g_browser_process->local_state());
1366 } 1366 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698