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

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

Issue 2695883003: Change uses of base::JoinString to pass StringPieces where possible. (Closed)
Patch Set: Fix android_webview compilation (and made FeatureList::SplitFeatureListString take StringPiece). Created 3 years, 9 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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 11 matching lines...) Expand all
22 #include "ash/shell.h" 22 #include "ash/shell.h"
23 #include "ash/sticky_keys/sticky_keys_controller.h" 23 #include "ash/sticky_keys/sticky_keys_controller.h"
24 #include "base/callback.h" 24 #include "base/callback.h"
25 #include "base/callback_helpers.h" 25 #include "base/callback_helpers.h"
26 #include "base/command_line.h" 26 #include "base/command_line.h"
27 #include "base/macros.h" 27 #include "base/macros.h"
28 #include "base/memory/ptr_util.h" 28 #include "base/memory/ptr_util.h"
29 #include "base/memory/singleton.h" 29 #include "base/memory/singleton.h"
30 #include "base/metrics/histogram_macros.h" 30 #include "base/metrics/histogram_macros.h"
31 #include "base/path_service.h" 31 #include "base/path_service.h"
32 #include "base/strings/string_piece.h"
32 #include "base/strings/string_split.h" 33 #include "base/strings/string_split.h"
33 #include "base/strings/string_util.h" 34 #include "base/strings/string_util.h"
34 #include "base/time/time.h" 35 #include "base/time/time.h"
35 #include "base/values.h" 36 #include "base/values.h"
36 #include "chrome/browser/accessibility/accessibility_extension_api.h" 37 #include "chrome/browser/accessibility/accessibility_extension_api.h"
37 #include "chrome/browser/browser_process.h" 38 #include "chrome/browser/browser_process.h"
38 #include "chrome/browser/chrome_notification_types.h" 39 #include "chrome/browser/chrome_notification_types.h"
39 #include "chrome/browser/chromeos/accessibility/accessibility_extension_loader.h " 40 #include "chrome/browser/chromeos/accessibility/accessibility_extension_loader.h "
40 #include "chrome/browser/chromeos/accessibility/accessibility_highlight_manager. h" 41 #include "chrome/browser/chromeos/accessibility/accessibility_highlight_manager. h"
41 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 42 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
(...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after
984 void AccessibilityManager::ReceiveBrailleDisplayState( 985 void AccessibilityManager::ReceiveBrailleDisplayState(
985 std::unique_ptr<extensions::api::braille_display_private::DisplayState> 986 std::unique_ptr<extensions::api::braille_display_private::DisplayState>
986 state) { 987 state) {
987 OnBrailleDisplayStateChanged(*state); 988 OnBrailleDisplayStateChanged(*state);
988 } 989 }
989 990
990 void AccessibilityManager::UpdateBrailleImeState() { 991 void AccessibilityManager::UpdateBrailleImeState() {
991 if (!profile_) 992 if (!profile_)
992 return; 993 return;
993 PrefService* pref_service = profile_->GetPrefs(); 994 PrefService* pref_service = profile_->GetPrefs();
994 std::vector<std::string> preload_engines = 995 std::string preload_engines_str =
995 base::SplitString(pref_service->GetString(prefs::kLanguagePreloadEngines), 996 pref_service->GetString(prefs::kLanguagePreloadEngines);
996 ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); 997 std::vector<base::StringPiece> preload_engines = base::SplitStringPiece(
997 std::vector<std::string>::iterator it = 998 preload_engines_str, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
998 std::find(preload_engines.begin(), 999 std::vector<base::StringPiece>::iterator it =
999 preload_engines.end(), 1000 std::find(preload_engines.begin(), preload_engines.end(),
1000 extension_misc::kBrailleImeEngineId); 1001 extension_misc::kBrailleImeEngineId);
1001 bool is_enabled = (it != preload_engines.end()); 1002 bool is_enabled = (it != preload_engines.end());
1002 bool should_be_enabled = 1003 bool should_be_enabled =
1003 (spoken_feedback_enabled_ && braille_display_connected_); 1004 (spoken_feedback_enabled_ && braille_display_connected_);
1004 if (is_enabled == should_be_enabled) 1005 if (is_enabled == should_be_enabled)
1005 return; 1006 return;
1006 if (should_be_enabled) 1007 if (should_be_enabled)
1007 preload_engines.push_back(extension_misc::kBrailleImeEngineId); 1008 preload_engines.push_back(extension_misc::kBrailleImeEngineId);
1008 else 1009 else
1009 preload_engines.erase(it); 1010 preload_engines.erase(it);
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
1398 content::BrowserContext* context) { 1399 content::BrowserContext* context) {
1399 keyboard_listener_extension_id_ = id; 1400 keyboard_listener_extension_id_ = id;
1400 1401
1401 extensions::ExtensionRegistry* registry = 1402 extensions::ExtensionRegistry* registry =
1402 extensions::ExtensionRegistry::Get(context); 1403 extensions::ExtensionRegistry::Get(context);
1403 if (!extension_registry_observer_.IsObserving(registry) && !id.empty()) 1404 if (!extension_registry_observer_.IsObserving(registry) && !id.empty())
1404 extension_registry_observer_.Add(registry); 1405 extension_registry_observer_.Add(registry);
1405 } 1406 }
1406 1407
1407 } // namespace chromeos 1408 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698