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

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: Remove dependency CL. 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 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
989 void AccessibilityManager::ReceiveBrailleDisplayState( 990 void AccessibilityManager::ReceiveBrailleDisplayState(
990 std::unique_ptr<extensions::api::braille_display_private::DisplayState> 991 std::unique_ptr<extensions::api::braille_display_private::DisplayState>
991 state) { 992 state) {
992 OnBrailleDisplayStateChanged(*state); 993 OnBrailleDisplayStateChanged(*state);
993 } 994 }
994 995
995 void AccessibilityManager::UpdateBrailleImeState() { 996 void AccessibilityManager::UpdateBrailleImeState() {
996 if (!profile_) 997 if (!profile_)
997 return; 998 return;
998 PrefService* pref_service = profile_->GetPrefs(); 999 PrefService* pref_service = profile_->GetPrefs();
999 std::vector<std::string> preload_engines = 1000 std::string preload_engines_str =
1000 base::SplitString(pref_service->GetString(prefs::kLanguagePreloadEngines), 1001 pref_service->GetString(prefs::kLanguagePreloadEngines);
1001 ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); 1002 std::vector<base::StringPiece> preload_engines = base::SplitStringPiece(
1002 std::vector<std::string>::iterator it = 1003 preload_engines_str, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
1003 std::find(preload_engines.begin(), 1004 std::vector<base::StringPiece>::iterator it =
1004 preload_engines.end(), 1005 std::find(preload_engines.begin(), preload_engines.end(),
1005 extension_misc::kBrailleImeEngineId); 1006 extension_misc::kBrailleImeEngineId);
1006 bool is_enabled = (it != preload_engines.end()); 1007 bool is_enabled = (it != preload_engines.end());
1007 bool should_be_enabled = 1008 bool should_be_enabled =
1008 (spoken_feedback_enabled_ && braille_display_connected_); 1009 (spoken_feedback_enabled_ && braille_display_connected_);
1009 if (is_enabled == should_be_enabled) 1010 if (is_enabled == should_be_enabled)
1010 return; 1011 return;
1011 if (should_be_enabled) 1012 if (should_be_enabled)
1012 preload_engines.push_back(extension_misc::kBrailleImeEngineId); 1013 preload_engines.push_back(extension_misc::kBrailleImeEngineId);
1013 else 1014 else
1014 preload_engines.erase(it); 1015 preload_engines.erase(it);
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
1429 content::BrowserContext* context) { 1430 content::BrowserContext* context) {
1430 keyboard_listener_extension_id_ = id; 1431 keyboard_listener_extension_id_ = id;
1431 1432
1432 extensions::ExtensionRegistry* registry = 1433 extensions::ExtensionRegistry* registry =
1433 extensions::ExtensionRegistry::Get(context); 1434 extensions::ExtensionRegistry::Get(context);
1434 if (!extension_registry_observer_.IsObserving(registry) && !id.empty()) 1435 if (!extension_registry_observer_.IsObserving(registry) && !id.empty())
1435 extension_registry_observer_.Add(registry); 1436 extension_registry_observer_.Add(registry);
1436 } 1437 }
1437 1438
1438 } // namespace chromeos 1439 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chromeos/input_method/input_method_syncer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698