chrome://accessibility: save "Internal" checkbox as preference

Saves the option to show the internal accessibility tree as the
preference kShowInternalAccessibilityTree.

Change-Id: Ib16c93f982da3e3cae1728fb8cdb0747a7463549
Reviewed-on: https://chromium-review.googlesource.com/1144271
Commit-Queue: James Wallace-Lee <jamwalla@chromium.org>
Reviewed-by: Gabriel Charette <gab@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577353}

chrome/browser/accessibility/accessibility_ui.cc

@@ -14,8 +14,12 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/common/webui_url_constants.h"
 #include "chrome/grit/browser_resources.h"
+#include "components/pref_registry/pref_registry_syncable.h"
+#include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/favicon_status.h"
@@ -57,8 +61,6 @@ static const char kDisabled[] = "disabled";
 
 namespace {
 
-bool g_show_internal_accessibility_tree = false;
-
 std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
     const GURL& url,
     const std::string& name,
@@ -163,7 +165,9 @@ bool HandleAccessibilityRequestCallback(
   data.SetString(kScreenReader, web ? (screenreader ? kOn : kOff) : kDisabled);
   data.SetString(kHTML, web ? (html ? kOn : kOff) : kDisabled);
 
-  data.SetString(kInternal, g_show_internal_accessibility_tree ? kOn : kOff);
+  PrefService* pref = Profile::FromBrowserContext(current_context)->GetPrefs();
+  bool show_internal = pref->GetBoolean(prefs::kShowInternalAccessibilityTree);
+  data.SetString(kInternal, show_internal ? kOn : kOff);
 
   std::string json_string;
   base::JSONWriter::Write(data, &json_string);
@@ -291,8 +295,8 @@ void AccessibilityUIMessageHandler::SetGlobalFlag(const base::ListValue* args) {
 
   AllowJavascript();
   if (flag_name_str == kInternal) {
-    g_show_internal_accessibility_tree = enabled;
-    LOG(ERROR) << "INTERNAL: " << g_show_internal_accessibility_tree;
+    PrefService* pref = Profile::FromWebUI(web_ui())->GetPrefs();
+    pref->SetBoolean(prefs::kShowInternalAccessibilityTree, enabled);
     return;
   }
 
@@ -368,8 +372,10 @@ void AccessibilityUIMessageHandler::RequestWebContentsTree(
   web_contents->SetAccessibilityMode(
       ui::AXMode(ui::AXMode::kNativeAPIs | ui::AXMode::kWebContents));
 
+  PrefService* pref = Profile::FromWebUI(web_ui())->GetPrefs();
+  bool internal = pref->GetBoolean(prefs::kShowInternalAccessibilityTree);
   base::string16 accessibility_contents_utf16 =
-      web_contents->DumpAccessibilityTree(g_show_internal_accessibility_tree);
+      web_contents->DumpAccessibilityTree(internal);
   result->SetString("tree", base::UTF16ToUTF8(accessibility_contents_utf16));
   CallJavascriptFunction("accessibility.showTree", *(result.get()));
 }
@@ -387,3 +393,9 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
   result->SetString("tree", str);
   CallJavascriptFunction("accessibility.showNativeUITree", *(result.get()));
 }
+
+// static
+void AccessibilityUIMessageHandler::RegisterProfilePrefs(
+    user_prefs::PrefRegistrySyncable* registry) {
+  registry->RegisterBooleanPref(prefs::kShowInternalAccessibilityTree, false);
+}

chrome/browser/accessibility/accessibility_ui.h

@@ -14,6 +14,10 @@ namespace base {
 class ListValue;
 }  // namespace base
 
+namespace user_prefs {
+class PrefRegistrySyncable;
+}  // namespace user_prefs
+
 class AccessibilityUI : public content::WebUIController {
  public:
   explicit AccessibilityUI(content::WebUI* web_ui);
@@ -27,6 +31,8 @@ class AccessibilityUIMessageHandler : public content::WebUIMessageHandler {
 
   void RegisterMessages() override;
 
+  static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
+
  private:
   void ToggleAccessibility(const base::ListValue* args);
   void SetGlobalFlag(const base::ListValue* args);

chrome/browser/prefs/browser_prefs.cc

@@ -10,6 +10,7 @@
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "chrome/browser/about_flags.h"
+#include "chrome/browser/accessibility/accessibility_ui.h"
 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
 #include "chrome/browser/browser_process_impl.h"
 #include "chrome/browser/chrome_content_browser_client.h"
@@ -512,6 +513,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   TRACE_EVENT0("browser", "chrome::RegisterProfilePrefs");
   SCOPED_UMA_HISTOGRAM_TIMER("Settings.RegisterProfilePrefsTime");
   // User prefs. Please keep this list alphabetized.
+  AccessibilityUIMessageHandler::RegisterProfilePrefs(registry);
   autofill::AutofillManager::RegisterProfilePrefs(registry);
   browsing_data::prefs::RegisterBrowserUserPrefs(registry);
   certificate_transparency::prefs::RegisterPrefs(registry);

chrome/common/pref_names.cc

@@ -990,6 +990,11 @@ const char kResetCheckDefaultBrowser[] =
 const char kDefaultBrowserSettingEnabled[] =
     "browser.default_browser_setting_enabled";
 
+// Boolean that indicates whether chrome://accessibility should show the
+// internal accessibility tree.
+const char kShowInternalAccessibilityTree[] =
+    "accessibility.show_internal_accessibility_tree";
+
 #if defined(OS_MACOSX)
 // Boolean that indicates whether the application should show the info bar
 // asking the user to set up automatic updates when Keystone promotion is

chrome/common/pref_names.h

@@ -169,6 +169,7 @@ extern const char kContextualSearchEnabled[];
     (defined(OS_LINUX) && !defined(OS_CHROMEOS))
 extern const char kConfirmToQuitEnabled[];
 #endif
+extern const char kShowInternalAccessibilityTree[];
 #if defined(OS_MACOSX)
 extern const char kShowFullscreenToolbar[];
 extern const char kAllowJavascriptAppleEvents[];