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

Side by Side Diff: chrome/browser/chromeos/accessibility/accessibility_manager.cc

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 years, 5 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/accessibility/accessibility_manager.h" 5 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
6 6
7 #include "ash/audio/sounds.h" 7 #include "ash/audio/sounds.h"
8 #include "ash/autoclick/autoclick_controller.h" 8 #include "ash/autoclick/autoclick_controller.h"
9 #include "ash/high_contrast/high_contrast_controller.h" 9 #include "ash/high_contrast/high_contrast_controller.h"
10 #include "ash/metrics/user_metrics_recorder.h" 10 #include "ash/metrics/user_metrics_recorder.h"
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after
838 bool is_enabled = (it != preload_engines.end()); 838 bool is_enabled = (it != preload_engines.end());
839 bool should_be_enabled = 839 bool should_be_enabled =
840 (spoken_feedback_enabled_ && braille_display_connected_); 840 (spoken_feedback_enabled_ && braille_display_connected_);
841 if (is_enabled == should_be_enabled) 841 if (is_enabled == should_be_enabled)
842 return; 842 return;
843 if (should_be_enabled) 843 if (should_be_enabled)
844 preload_engines.push_back(extension_misc::kBrailleImeEngineId); 844 preload_engines.push_back(extension_misc::kBrailleImeEngineId);
845 else 845 else
846 preload_engines.erase(it); 846 preload_engines.erase(it);
847 pref_service->SetString(prefs::kLanguagePreloadEngines, 847 pref_service->SetString(prefs::kLanguagePreloadEngines,
848 JoinString(preload_engines, ',')); 848 base::JoinString(preload_engines, ","));
849 braille_ime_current_ = false; 849 braille_ime_current_ = false;
850 } 850 }
851 851
852 // Overridden from InputMethodManager::Observer. 852 // Overridden from InputMethodManager::Observer.
853 void AccessibilityManager::InputMethodChanged( 853 void AccessibilityManager::InputMethodChanged(
854 input_method::InputMethodManager* manager, 854 input_method::InputMethodManager* manager,
855 Profile* /* profile */, 855 Profile* /* profile */,
856 bool show_message) { 856 bool show_message) {
857 // Sticky keys is implemented only in ash. 857 // Sticky keys is implemented only in ash.
858 // TODO(dpolukhin): support Athena, crbug.com/408733. 858 // TODO(dpolukhin): support Athena, crbug.com/408733.
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
1123 void AccessibilityManager::PostUnloadChromeVox(Profile* profile) { 1123 void AccessibilityManager::PostUnloadChromeVox(Profile* profile) {
1124 // Do any teardown work needed immediately after ChromeVox actually unloads. 1124 // Do any teardown work needed immediately after ChromeVox actually unloads.
1125 if (system_sounds_enabled_) 1125 if (system_sounds_enabled_)
1126 ash::PlaySystemSoundAlways(SOUND_SPOKEN_FEEDBACK_DISABLED); 1126 ash::PlaySystemSoundAlways(SOUND_SPOKEN_FEEDBACK_DISABLED);
1127 // Clear the accessibility focus ring. 1127 // Clear the accessibility focus ring.
1128 AccessibilityFocusRingController::GetInstance()->SetFocusRing( 1128 AccessibilityFocusRingController::GetInstance()->SetFocusRing(
1129 std::vector<gfx::Rect>()); 1129 std::vector<gfx::Rect>());
1130 } 1130 }
1131 1131
1132 } // namespace chromeos 1132 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/chromeos/input_method/input_method_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698