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

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

Issue 13671005: Re-apply 192420: Move login switches to src/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
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/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" 59 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
60 #include "chrome/browser/chromeos/policy/network_configuration_updater.h" 60 #include "chrome/browser/chromeos/policy/network_configuration_updater.h"
61 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" 61 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
62 #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h" 62 #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h"
63 #include "chrome/browser/chromeos/settings/cros_settings.h" 63 #include "chrome/browser/chromeos/settings/cros_settings.h"
64 #include "chrome/browser/chromeos/settings/cros_settings_provider.h" 64 #include "chrome/browser/chromeos/settings/cros_settings_provider.h"
65 #include "chrome/browser/chromeos/settings/device_settings_service.h" 65 #include "chrome/browser/chromeos/settings/device_settings_service.h"
66 #include "chrome/browser/chromeos/system/statistics_provider.h" 66 #include "chrome/browser/chromeos/system/statistics_provider.h"
67 #include "chrome/browser/chromeos/system/timezone_settings.h" 67 #include "chrome/browser/chromeos/system/timezone_settings.h"
68 #include "chrome/browser/policy/cloud/resource_cache.h" 68 #include "chrome/browser/policy/cloud/resource_cache.h"
69 #include "chromeos/chromeos_switches.h"
69 #include "chromeos/dbus/cryptohome_client.h" 70 #include "chromeos/dbus/cryptohome_client.h"
70 #include "chromeos/dbus/dbus_thread_manager.h" 71 #include "chromeos/dbus/dbus_thread_manager.h"
71 #else 72 #else
72 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" 73 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
73 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 74 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
74 #endif 75 #endif
75 76
76 using content::BrowserThread; 77 using content::BrowserThread;
77 78
78 namespace policy { 79 namespace policy {
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 // (a) Existing profiles may hold pointers to |user_cloud_policy_manager_|. 315 // (a) Existing profiles may hold pointers to |user_cloud_policy_manager_|.
315 // (b) Implementing UserCloudPolicyManager::IsInitializationComplete() 316 // (b) Implementing UserCloudPolicyManager::IsInitializationComplete()
316 // correctly is impossible for re-initialization. 317 // correctly is impossible for re-initialization.
317 CHECK(!user_cloud_policy_manager_); 318 CHECK(!user_cloud_policy_manager_);
318 319
319 CommandLine* command_line = CommandLine::ForCurrentProcess(); 320 CommandLine* command_line = CommandLine::ForCurrentProcess();
320 321
321 base::FilePath profile_dir; 322 base::FilePath profile_dir;
322 CHECK(PathService::Get(chrome::DIR_USER_DATA, &profile_dir)); 323 CHECK(PathService::Get(chrome::DIR_USER_DATA, &profile_dir));
323 profile_dir = profile_dir.Append( 324 profile_dir = profile_dir.Append(
324 command_line->GetSwitchValuePath(switches::kLoginProfile)); 325 command_line->GetSwitchValuePath(chromeos::switches::kLoginProfile));
325 const base::FilePath legacy_dir = profile_dir.Append(kDeviceManagementDir); 326 const base::FilePath legacy_dir = profile_dir.Append(kDeviceManagementDir);
326 const base::FilePath policy_cache_file = legacy_dir.Append(kPolicy); 327 const base::FilePath policy_cache_file = legacy_dir.Append(kPolicy);
327 const base::FilePath token_cache_file = legacy_dir.Append(kToken); 328 const base::FilePath token_cache_file = legacy_dir.Append(kToken);
328 const base::FilePath resource_cache_dir = 329 const base::FilePath resource_cache_dir =
329 profile_dir.Append(kPolicy).Append(kResourceDir); 330 profile_dir.Append(kPolicy).Append(kResourceDir);
330 base::FilePath policy_key_dir; 331 base::FilePath policy_key_dir;
331 CHECK(PathService::Get(chrome::DIR_USER_POLICY_KEYS, &policy_key_dir)); 332 CHECK(PathService::Get(chrome::DIR_USER_POLICY_KEYS, &policy_key_dir));
332 333
333 if (wait_for_policy_fetch) 334 if (wait_for_policy_fetch)
334 device_management_service_->ScheduleInitialization(0); 335 device_management_service_->ScheduleInitialization(0);
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 return new AsyncPolicyProvider(loader.Pass()); 582 return new AsyncPolicyProvider(loader.Pass());
582 } else { 583 } else {
583 return NULL; 584 return NULL;
584 } 585 }
585 #else 586 #else
586 return NULL; 587 return NULL;
587 #endif 588 #endif
588 } 589 }
589 590
590 } // namespace policy 591 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698