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

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

Issue 14820030: Move Chrome OS switches to chromeos/chromeos_switches.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nits Created 7 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
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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 local_state_, 177 local_state_,
178 chromeos::system::StatisticsProvider::GetInstance(), 178 chromeos::system::StatisticsProvider::GetInstance(),
179 NULL)); 179 NULL));
180 device_cloud_policy_manager_->Connect( 180 device_cloud_policy_manager_->Connect(
181 local_state_, 181 local_state_,
182 device_management_service_.get(), 182 device_management_service_.get(),
183 status_provider.Pass()); 183 status_provider.Pass());
184 } 184 }
185 185
186 CommandLine* command_line = CommandLine::ForCurrentProcess(); 186 CommandLine* command_line = CommandLine::ForCurrentProcess();
187 if (!command_line->HasSwitch(switches::kDisableLocalAccounts)) { 187 if (!command_line->HasSwitch(chromeos::switches::kDisableLocalAccounts)) {
188 device_local_account_policy_service_.reset( 188 device_local_account_policy_service_.reset(
189 new DeviceLocalAccountPolicyService( 189 new DeviceLocalAccountPolicyService(
190 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(), 190 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
191 chromeos::DeviceSettingsService::Get())); 191 chromeos::DeviceSettingsService::Get()));
192 device_local_account_policy_service_->Connect( 192 device_local_account_policy_service_->Connect(
193 device_management_service_.get()); 193 device_management_service_.get());
194 } 194 }
195 195
196 GetAppPackUpdater(); 196 GetAppPackUpdater();
197 197
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 return new AsyncPolicyProvider(loader.Pass()); 484 return new AsyncPolicyProvider(loader.Pass());
485 } else { 485 } else {
486 return NULL; 486 return NULL;
487 } 487 }
488 #else 488 #else
489 return NULL; 489 return NULL;
490 #endif 490 #endif
491 } 491 }
492 492
493 } // namespace policy 493 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/prefs/command_line_pref_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698