Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "content/browser/accessibility/browser_accessibility_state_impl.h" | 5 #include "content/browser/accessibility/browser_accessibility_state_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
| 11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
| 12 #include "content/browser/renderer_host/render_widget_host_impl.h" | 12 #include "content/browser/renderer_host/render_widget_host_impl.h" |
| 13 #include "content/browser/web_contents/web_contents_impl.h" | 13 #include "content/browser/web_contents/web_contents_impl.h" |
| 14 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
| 15 #include "content/public/common/content_switches.h" | 15 #include "content/public/common/content_switches.h" |
| 16 #include "ui/gfx/color_utils.h" | 16 #include "ui/gfx/color_utils.h" |
| 17 | 17 |
| 18 namespace content { | 18 namespace content { |
| 19 | 19 |
| 20 // IMPORTANT! | |
| 21 // These values are written to logs. Do not renumber or delete | |
| 22 // existing items; add new entries to the end of the list. | |
| 23 enum ModeFlagHistogramValue { | |
| 24 UMA_AX_MODE_FLAG_NATIVE_APIS = 0, | |
| 25 UMA_AX_MODE_FLAG_WEB_CONTENTS = 1, | |
| 26 UMA_AX_MODE_FLAG_INLINE_TEXT_BOXES = 2, | |
| 27 UMA_AX_MODE_FLAG_SCREEN_READER = 3, | |
| 28 UMA_AX_MODE_FLAG_HTML = 4, | |
| 29 | |
| 30 // This must always be the last enum. It's okay for its value to | |
| 31 // increase, but none of the other enum values may change. | |
| 32 UMA_AX_MODE_FLAG_MAX | |
| 33 }; | |
| 34 | |
| 35 // Record a histograms for an accessibility mode when it's enabled. | |
| 36 void RecordNewAccessibilityModeFlags(ModeFlagHistogramValue mode_flag) { | |
| 37 UMA_HISTOGRAM_ENUMERATION("Accessibility.ModeFlag", | |
| 38 mode_flag, | |
| 39 UMA_AX_MODE_FLAG_MAX); | |
| 40 } | |
| 41 | |
| 20 // Update the accessibility histogram 45 seconds after initialization. | 42 // Update the accessibility histogram 45 seconds after initialization. |
| 21 static const int kAccessibilityHistogramDelaySecs = 45; | 43 static const int ACCESSIBILITY_HISTOGRAM_DELAY_SECS = 45; |
| 22 | 44 |
| 23 // static | 45 // static |
| 24 BrowserAccessibilityState* BrowserAccessibilityState::GetInstance() { | 46 BrowserAccessibilityState* BrowserAccessibilityState::GetInstance() { |
| 25 return BrowserAccessibilityStateImpl::GetInstance(); | 47 return BrowserAccessibilityStateImpl::GetInstance(); |
| 26 } | 48 } |
| 27 | 49 |
| 28 // static | 50 // static |
| 29 BrowserAccessibilityStateImpl* BrowserAccessibilityStateImpl::GetInstance() { | 51 BrowserAccessibilityStateImpl* BrowserAccessibilityStateImpl::GetInstance() { |
| 30 return base::Singleton< | 52 return base::Singleton< |
| 31 BrowserAccessibilityStateImpl, | 53 BrowserAccessibilityStateImpl, |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 47 // thread. | 69 // thread. |
| 48 BrowserThread::ID update_histogram_thread = BrowserThread::UI; | 70 BrowserThread::ID update_histogram_thread = BrowserThread::UI; |
| 49 #endif | 71 #endif |
| 50 | 72 |
| 51 // We need to AddRef() the leaky singleton so that Bind doesn't | 73 // We need to AddRef() the leaky singleton so that Bind doesn't |
| 52 // delete it prematurely. | 74 // delete it prematurely. |
| 53 AddRef(); | 75 AddRef(); |
| 54 BrowserThread::PostDelayedTask( | 76 BrowserThread::PostDelayedTask( |
| 55 update_histogram_thread, FROM_HERE, | 77 update_histogram_thread, FROM_HERE, |
| 56 base::Bind(&BrowserAccessibilityStateImpl::UpdateHistograms, this), | 78 base::Bind(&BrowserAccessibilityStateImpl::UpdateHistograms, this), |
| 57 base::TimeDelta::FromSeconds(kAccessibilityHistogramDelaySecs)); | 79 base::TimeDelta::FromSeconds(ACCESSIBILITY_HISTOGRAM_DELAY_SECS)); |
| 58 } | 80 } |
| 59 | 81 |
| 60 BrowserAccessibilityStateImpl::~BrowserAccessibilityStateImpl() { | 82 BrowserAccessibilityStateImpl::~BrowserAccessibilityStateImpl() { |
| 61 } | 83 } |
| 62 | 84 |
| 63 void BrowserAccessibilityStateImpl::OnScreenReaderDetected() { | 85 void BrowserAccessibilityStateImpl::OnScreenReaderDetected() { |
| 64 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 86 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 65 switches::kDisableRendererAccessibility)) { | 87 switches::kDisableRendererAccessibility)) { |
| 66 return; | 88 return; |
| 67 } | 89 } |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 106 void BrowserAccessibilityStateImpl::UpdateHistogramsForTesting() { | 128 void BrowserAccessibilityStateImpl::UpdateHistogramsForTesting() { |
| 107 UpdateHistograms(); | 129 UpdateHistograms(); |
| 108 } | 130 } |
| 109 | 131 |
| 110 void BrowserAccessibilityStateImpl::UpdateHistograms() { | 132 void BrowserAccessibilityStateImpl::UpdateHistograms() { |
| 111 UpdatePlatformSpecificHistograms(); | 133 UpdatePlatformSpecificHistograms(); |
| 112 | 134 |
| 113 for (size_t i = 0; i < histogram_callbacks_.size(); ++i) | 135 for (size_t i = 0; i < histogram_callbacks_.size(); ++i) |
| 114 histogram_callbacks_[i].Run(); | 136 histogram_callbacks_[i].Run(); |
| 115 | 137 |
| 116 UMA_HISTOGRAM_BOOLEAN("Accessibility.State", IsAccessibleBrowser()); | 138 UMA_HISTOGRAM_BOOLEAN("Accessibility.State", IsAccessibleBrowser()); |
|
Ilya Sherman
2016/12/19 22:58:29
Please add a TODO to remove this histogram, along
dmazzoni
2016/12/19 23:02:15
Done.
| |
| 117 UMA_HISTOGRAM_BOOLEAN("Accessibility.InvertedColors", | 139 UMA_HISTOGRAM_BOOLEAN("Accessibility.InvertedColors", |
| 118 color_utils::IsInvertedColorScheme()); | 140 color_utils::IsInvertedColorScheme()); |
| 119 UMA_HISTOGRAM_BOOLEAN("Accessibility.ManuallyEnabled", | 141 UMA_HISTOGRAM_BOOLEAN("Accessibility.ManuallyEnabled", |
| 120 base::CommandLine::ForCurrentProcess()->HasSwitch( | 142 base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 121 switches::kForceRendererAccessibility)); | 143 switches::kForceRendererAccessibility)); |
| 122 } | 144 } |
| 123 | 145 |
| 124 #if !defined(OS_WIN) && !defined(OS_MACOSX) | 146 #if !defined(OS_WIN) && !defined(OS_MACOSX) |
| 125 void BrowserAccessibilityStateImpl::UpdatePlatformSpecificHistograms() { | 147 void BrowserAccessibilityStateImpl::UpdatePlatformSpecificHistograms() { |
| 126 } | 148 } |
| 127 #endif | 149 #endif |
| 128 | 150 |
| 129 void BrowserAccessibilityStateImpl::AddAccessibilityModeFlags( | 151 void BrowserAccessibilityStateImpl::AddAccessibilityModeFlags( |
| 130 AccessibilityMode mode) { | 152 AccessibilityMode mode) { |
| 131 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 153 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 132 switches::kDisableRendererAccessibility)) { | 154 switches::kDisableRendererAccessibility)) { |
| 133 return; | 155 return; |
| 134 } | 156 } |
| 135 | 157 |
| 158 AccessibilityMode previous_mode = accessibility_mode_; | |
| 136 accessibility_mode_ |= mode; | 159 accessibility_mode_ |= mode; |
| 160 if (accessibility_mode_ == previous_mode) | |
| 161 return; | |
| 162 | |
| 163 // Retrieve only newly added modes for the purposes of logging. | |
| 164 AccessibilityMode new_mode_flags = accessibility_mode_ & (~previous_mode); | |
| 165 if (new_mode_flags & ACCESSIBILITY_MODE_FLAG_NATIVE_APIS) | |
| 166 RecordNewAccessibilityModeFlags(UMA_AX_MODE_FLAG_NATIVE_APIS); | |
| 167 if (new_mode_flags & ACCESSIBILITY_MODE_FLAG_WEB_CONTENTS) | |
| 168 RecordNewAccessibilityModeFlags(UMA_AX_MODE_FLAG_WEB_CONTENTS); | |
| 169 if (new_mode_flags & ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES) | |
| 170 RecordNewAccessibilityModeFlags(UMA_AX_MODE_FLAG_INLINE_TEXT_BOXES); | |
| 171 if (new_mode_flags & ACCESSIBILITY_MODE_FLAG_SCREEN_READER) | |
| 172 RecordNewAccessibilityModeFlags(UMA_AX_MODE_FLAG_SCREEN_READER); | |
| 173 if (new_mode_flags & ACCESSIBILITY_MODE_FLAG_HTML) | |
| 174 RecordNewAccessibilityModeFlags(UMA_AX_MODE_FLAG_HTML); | |
| 175 | |
| 137 std::vector<WebContentsImpl*> web_contents_vector = | 176 std::vector<WebContentsImpl*> web_contents_vector = |
| 138 WebContentsImpl::GetAllWebContents(); | 177 WebContentsImpl::GetAllWebContents(); |
| 139 for (size_t i = 0; i < web_contents_vector.size(); ++i) | 178 for (size_t i = 0; i < web_contents_vector.size(); ++i) |
| 140 web_contents_vector[i]->AddAccessibilityMode(accessibility_mode_); | 179 web_contents_vector[i]->AddAccessibilityMode(accessibility_mode_); |
| 141 } | 180 } |
| 142 | 181 |
| 143 void BrowserAccessibilityStateImpl::RemoveAccessibilityModeFlags( | 182 void BrowserAccessibilityStateImpl::RemoveAccessibilityModeFlags( |
| 144 AccessibilityMode mode) { | 183 AccessibilityMode mode) { |
| 145 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 184 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 146 switches::kForceRendererAccessibility) && | 185 switches::kForceRendererAccessibility) && |
| 147 mode == ACCESSIBILITY_MODE_COMPLETE) { | 186 mode == ACCESSIBILITY_MODE_COMPLETE) { |
| 148 return; | 187 return; |
| 149 } | 188 } |
| 150 | 189 |
| 151 accessibility_mode_ = accessibility_mode_ ^ (mode & accessibility_mode_); | 190 accessibility_mode_ = accessibility_mode_ ^ (mode & accessibility_mode_); |
| 152 std::vector<WebContentsImpl*> web_contents_vector = | 191 std::vector<WebContentsImpl*> web_contents_vector = |
| 153 WebContentsImpl::GetAllWebContents(); | 192 WebContentsImpl::GetAllWebContents(); |
| 154 for (size_t i = 0; i < web_contents_vector.size(); ++i) | 193 for (size_t i = 0; i < web_contents_vector.size(); ++i) |
| 155 web_contents_vector[i]->SetAccessibilityMode(accessibility_mode()); | 194 web_contents_vector[i]->SetAccessibilityMode(accessibility_mode()); |
| 156 } | 195 } |
| 157 | 196 |
| 158 } // namespace content | 197 } // namespace content |
| OLD | NEW |