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

Side by Side Diff: chrome/browser/chromeos/system/input_device_settings.cc

Issue 1492043002: Introduced switches for Master/Slave bootstrapping process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove the unused shark requisition. Created 5 years 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
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/chromeos/system/input_device_settings.h" 5 #include "chrome/browser/chromeos/system/input_device_settings.h"
6 6
7 #include "base/prefs/pref_registry_simple.h" 7 #include "base/prefs/pref_registry_simple.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 10 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 policy::BrowserPolicyConnectorChromeOS* connector = 198 policy::BrowserPolicyConnectorChromeOS* connector =
199 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 199 g_browser_process->platform_part()->browser_policy_connector_chromeos();
200 if (!connector) 200 if (!connector)
201 return false; 201 return false;
202 202
203 policy::DeviceCloudPolicyManagerChromeOS* policy_manager = 203 policy::DeviceCloudPolicyManagerChromeOS* policy_manager =
204 connector->GetDeviceCloudPolicyManager(); 204 connector->GetDeviceCloudPolicyManager();
205 if (!policy_manager) 205 if (!policy_manager)
206 return false; 206 return false;
207 207
208 if (policy_manager->IsRemoraRequisition() || 208 if (policy_manager->IsRemoraRequisition()) {
209 policy_manager->IsSharkRequisition()) {
210 return true; 209 return true;
211 } 210 }
212 211
213 bool keyboard_driven = false; 212 bool keyboard_driven = false;
214 if (chromeos::system::StatisticsProvider::GetInstance()->GetMachineFlag( 213 if (chromeos::system::StatisticsProvider::GetInstance()->GetMachineFlag(
215 kOemKeyboardDrivenOobeKey, &keyboard_driven)) { 214 kOemKeyboardDrivenOobeKey, &keyboard_driven)) {
216 return keyboard_driven; 215 return keyboard_driven;
217 } 216 }
218 217
219 return false; 218 return false;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 local_state->HasPrefPath(::prefs::kTouchPadEnabled) 263 local_state->HasPrefPath(::prefs::kTouchPadEnabled)
265 ? local_state->GetBoolean(::prefs::kTouchPadEnabled) 264 ? local_state->GetBoolean(::prefs::kTouchPadEnabled)
266 : true; 265 : true;
267 266
268 local_state->SetBoolean(::prefs::kTouchPadEnabled, !touch_pad_status); 267 local_state->SetBoolean(::prefs::kTouchPadEnabled, !touch_pad_status);
269 SetInternalTouchpadEnabled(!touch_pad_status); 268 SetInternalTouchpadEnabled(!touch_pad_status);
270 } 269 }
271 270
272 } // namespace system 271 } // namespace system
273 } // namespace chromeos 272 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698