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

Side by Side Diff: ui/base/ime/chromeos/component_extension_ime_manager.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "ui/base/ime/chromeos/component_extension_ime_manager.h" 5 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 ComponentExtensionIMEManager::ComponentExtensionIMEManager() { 117 ComponentExtensionIMEManager::ComponentExtensionIMEManager() {
118 for (size_t i = 0; i < arraysize(kLoginLayoutWhitelist); ++i) { 118 for (size_t i = 0; i < arraysize(kLoginLayoutWhitelist); ++i) {
119 login_layout_set_.insert(kLoginLayoutWhitelist[i]); 119 login_layout_set_.insert(kLoginLayoutWhitelist[i]);
120 } 120 }
121 } 121 }
122 122
123 ComponentExtensionIMEManager::~ComponentExtensionIMEManager() { 123 ComponentExtensionIMEManager::~ComponentExtensionIMEManager() {
124 } 124 }
125 125
126 void ComponentExtensionIMEManager::Initialize( 126 void ComponentExtensionIMEManager::Initialize(
127 scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate) { 127 std::unique_ptr<ComponentExtensionIMEManagerDelegate> delegate) {
128 delegate_ = std::move(delegate); 128 delegate_ = std::move(delegate);
129 std::vector<ComponentExtensionIME> ext_list = delegate_->ListIME(); 129 std::vector<ComponentExtensionIME> ext_list = delegate_->ListIME();
130 for (size_t i = 0; i < ext_list.size(); ++i) { 130 for (size_t i = 0; i < ext_list.size(); ++i) {
131 ComponentExtensionIME& ext = ext_list[i]; 131 ComponentExtensionIME& ext = ext_list[i];
132 bool extension_exists = IsWhitelistedExtension(ext.id); 132 bool extension_exists = IsWhitelistedExtension(ext.id);
133 if (!extension_exists) 133 if (!extension_exists)
134 component_extension_imes_[ext.id] = ext; 134 component_extension_imes_[ext.id] = ext;
135 for (size_t j = 0; j < ext.engines.size(); ++j) { 135 for (size_t j = 0; j < ext.engines.size(); ++j) {
136 ComponentExtensionEngine& ime = ext.engines[j]; 136 ComponentExtensionEngine& ime = ext.engines[j];
137 const std::string input_method_id = 137 const std::string input_method_id =
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 bool ComponentExtensionIMEManager::IsInLoginLayoutWhitelist( 246 bool ComponentExtensionIMEManager::IsInLoginLayoutWhitelist(
247 const std::vector<std::string>& layouts) { 247 const std::vector<std::string>& layouts) {
248 for (size_t i = 0; i < layouts.size(); ++i) { 248 for (size_t i = 0; i < layouts.size(); ++i) {
249 if (login_layout_set_.find(layouts[i]) != login_layout_set_.end()) 249 if (login_layout_set_.find(layouts[i]) != login_layout_set_.end())
250 return true; 250 return true;
251 } 251 }
252 return false; 252 return false;
253 } 253 }
254 254
255 } // namespace chromeos 255 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698