Enabled/disable touch screen in TabletPowerButtonController

chrome/browser/chromeos/system/input_device_settings.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/system/input_device_settings.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 216 matching lines @@
   bool keyboard_driven = false;
   if (chromeos::system::StatisticsProvider::GetInstance()->GetMachineFlag(
           kOemKeyboardDrivenOobeKey, &keyboard_driven)) {
     return keyboard_driven;
   }
 
   return false;
 }
 
 // static
+void InputDeviceSettings::RegisterPrefs(PrefRegistrySimple* registry) {
+  registry->RegisterBooleanPref(::prefs::kLocalTouchScreenEnabled, true);
+}
+
+// static
 void InputDeviceSettings::RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(::prefs::kTouchScreenEnabled, true);
   registry->RegisterBooleanPref(::prefs::kTouchPadEnabled, true);
 }
 
-void InputDeviceSettings::UpdateTouchDevicesStatusFromActiveProfilePrefs() {
+void InputDeviceSettings::UpdateTouchDevicesStatusFromPrefs() {
+  UpdateTouchscreenStatusFromPrefs();
+
   PrefService* user_prefs = GetActiveProfilePrefs();
   if (!user_prefs)
     return;
 
-  const bool touch_screen_status =
-      user_prefs->HasPrefPath(::prefs::kTouchScreenEnabled)
-          ? user_prefs->GetBoolean(::prefs::kTouchScreenEnabled)
-          : true;
-
   const bool touch_pad_status =
       user_prefs->HasPrefPath(::prefs::kTouchPadEnabled)
           ? user_prefs->GetBoolean(::prefs::kTouchPadEnabled)
           : true;
-
-  SetTouchscreensEnabled(touch_screen_status);
   SetInternalTouchpadEnabled(touch_pad_status);
 }
 
-void InputDeviceSettings::ToggleTouchscreen() {
-  PrefService* user_prefs = GetActiveProfilePrefs();
-  if (!user_prefs)
-    return;
+bool InputDeviceSettings::IsTouchscreenEnabledInPrefs(bool is_local) const {
+  if (is_local) {
+    PrefService* local_state = g_browser_process->local_state();
+    DCHECK(local_state);
 
-  const bool touch_screen_status =
-      user_prefs->HasPrefPath(::prefs::kTouchScreenEnabled)
-          ? user_prefs->GetBoolean(::prefs::kTouchScreenEnabled)
-          : true;
+    return local_state->HasPrefPath(::prefs::kLocalTouchScreenEnabled)
+               ? local_state->GetBoolean(::prefs::kLocalTouchScreenEnabled)
+               : true;
+  } else {
+    PrefService* user_prefs = GetActiveProfilePrefs();
+    if (!user_prefs)
+      return true;
 
-  user_prefs->SetBoolean(::prefs::kTouchScreenEnabled, !touch_screen_status);
-  SetTouchscreensEnabled(!touch_screen_status);
+    return user_prefs->HasPrefPath(::prefs::kTouchScreenEnabled)
+               ? user_prefs->GetBoolean(::prefs::kTouchScreenEnabled)
+               : true;
+  }
+}
+
+void InputDeviceSettings::SetTouchscreenEnabledInPrefs(bool enabled,
+                                                       bool is_local) {
+  if (is_local) {
+    PrefService* local_state = g_browser_process->local_state();
+    DCHECK(local_state);
+    local_state->SetBoolean(::prefs::kLocalTouchScreenEnabled, enabled);
+  } else {
+    PrefService* user_prefs = GetActiveProfilePrefs();
+    if (!user_prefs)
+      return;
+    user_prefs->SetBoolean(::prefs::kTouchScreenEnabled, enabled);
+  }
+}
+
+void InputDeviceSettings::UpdateTouchscreenStatusFromPrefs() {
+  SetTouchscreensEnabled(IsTouchscreenEnabledInPrefs(true) ==
+                         IsTouchscreenEnabledInPrefs(false));

[afakhry, 2016/12/02 20:04:27]

I think you need to AND them together.

[Qiang(Joe) Xu, 2016/12/02 21:23:13]

I once thought it should do AND, but then find it should properly do XNOR?
Because the shortcut actually is doing ToggleTouchScreen, so it should flip the
final effect if it differs with the local pref, right?

I leave no change here for now. We can also discuss it per offline.

 }
 
 void InputDeviceSettings::ToggleTouchpad() {
   PrefService* user_prefs = GetActiveProfilePrefs();
   if (!user_prefs)
     return;
 
   const bool touch_pad_status =
       user_prefs->HasPrefPath(::prefs::kTouchPadEnabled)
           ? user_prefs->GetBoolean(::prefs::kTouchPadEnabled)
           : true;
 
   user_prefs->SetBoolean(::prefs::kTouchPadEnabled, !touch_pad_status);
   SetInternalTouchpadEnabled(!touch_pad_status);
 }
 
 }  // namespace system
 }  // namespace chromeos