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

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_manager_impl.cc

Issue 2721153004: Remove ash_util namespace (Closed)
Patch Set: 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) 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 "chrome/browser/chromeos/input_method/input_method_manager_impl.h" 5 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> // std::find 9 #include <algorithm> // std::find
10 #include <memory> 10 #include <memory>
(...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 bool enable_extension_loading) 916 bool enable_extension_loading)
917 : delegate_(std::move(delegate)), 917 : delegate_(std::move(delegate)),
918 ui_session_(STATE_LOGIN_SCREEN), 918 ui_session_(STATE_LOGIN_SCREEN),
919 state_(NULL), 919 state_(NULL),
920 util_(delegate_.get()), 920 util_(delegate_.get()),
921 component_extension_ime_manager_(new ComponentExtensionIMEManager()), 921 component_extension_ime_manager_(new ComponentExtensionIMEManager()),
922 enable_extension_loading_(enable_extension_loading), 922 enable_extension_loading_(enable_extension_loading),
923 is_ime_menu_activated_(false) { 923 is_ime_menu_activated_(false) {
924 // TODO(mohsen): Revisit using FakeImeKeyboard with mash when InputController 924 // TODO(mohsen): Revisit using FakeImeKeyboard with mash when InputController
925 // work is ready. http://crbug.com/601981 925 // work is ready. http://crbug.com/601981
926 if (IsRunningAsSystemCompositor() && !ash_util::IsRunningInMash()) 926 if (IsRunningAsSystemCompositor() && !IsRunningInMash())
927 keyboard_.reset(ImeKeyboard::Create()); 927 keyboard_.reset(ImeKeyboard::Create());
928 else 928 else
929 keyboard_.reset(new FakeImeKeyboard()); 929 keyboard_.reset(new FakeImeKeyboard());
930 930
931 // Initializes the system IME list. 931 // Initializes the system IME list.
932 std::unique_ptr<ComponentExtensionIMEManagerDelegate> comp_delegate( 932 std::unique_ptr<ComponentExtensionIMEManagerDelegate> comp_delegate(
933 new ComponentExtensionIMEManagerImpl()); 933 new ComponentExtensionIMEManagerImpl());
934 component_extension_ime_manager_->Initialize(std::move(comp_delegate)); 934 component_extension_ime_manager_->Initialize(std::move(comp_delegate));
935 const InputMethodDescriptors& descriptors = 935 const InputMethodDescriptors& descriptors =
936 component_extension_ime_manager_->GetAllIMEAsInputMethodDescriptor(); 936 component_extension_ime_manager_->GetAllIMEAsInputMethodDescriptor();
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
1327 if (keyboard_controller) 1327 if (keyboard_controller)
1328 keyboard_controller->Reload(); 1328 keyboard_controller->Reload();
1329 } 1329 }
1330 1330
1331 bool InputMethodManagerImpl::IsEmojiHandwritingVoiceOnImeMenuEnabled() { 1331 bool InputMethodManagerImpl::IsEmojiHandwritingVoiceOnImeMenuEnabled() {
1332 return base::FeatureList::IsEnabled(features::kEHVInputOnImeMenu); 1332 return base::FeatureList::IsEnabled(features::kEHVInputOnImeMenu);
1333 } 1333 }
1334 1334
1335 } // namespace input_method 1335 } // namespace input_method
1336 } // namespace chromeos 1336 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698