Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
index fc12774fbf513ccaec6bfad767261f6ecf118f40..7612376dd93c247862dda2456951724565992bfc 100644 |
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
@@ -26,7 +26,6 @@ |
#include "base/logging.h" |
#include "base/memory/ptr_util.h" |
#include "base/metrics/user_metrics.h" |
-#include "base/strings/utf_string_conversions.h" |
#include "base/sys_info.h" |
#include "base/time/time.h" |
#include "chrome/browser/browser_process.h" |
@@ -57,11 +56,8 @@ |
#include "components/user_manager/user_type.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_service.h" |
-#include "ui/base/ime/chromeos/extension_ime_util.h" |
#include "ui/base/ime/chromeos/input_method_manager.h" |
-#include "ui/base/ime/chromeos/input_method_util.h" |
#include "ui/chromeos/events/pref_names.h" |
-#include "ui/chromeos/ime/input_method_menu_item.h" |
#include "ui/chromeos/ime/input_method_menu_manager.h" |
namespace chromeos { |
@@ -74,16 +70,6 @@ const int kSessionLengthLimitMinMs = 30 * 1000; // 30 seconds. |
// The maximum session length limit that can be set. |
const int kSessionLengthLimitMaxMs = 24 * 60 * 60 * 1000; // 24 hours. |
-void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime, |
- const input_method::InputMethodUtil& util, |
- ash::IMEInfo* info) { |
- info->id = ime.id(); |
- info->name = util.GetInputMethodLongName(ime); |
- info->medium_name = util.GetInputMethodMediumName(ime); |
- info->short_name = util.GetInputMethodShortName(ime); |
- info->third_party = extension_ime_util::IsExtensionIME(ime.id()); |
-} |
- |
void OnAcceptMultiprofilesIntro(bool no_show_again) { |
PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs(); |
prefs->SetBoolean(prefs::kMultiProfileNeverShowIntro, no_show_again); |
@@ -203,47 +189,6 @@ void SystemTrayDelegateChromeOS::ShowUserLogin() { |
} |
} |
-void SystemTrayDelegateChromeOS::GetCurrentIME(ash::IMEInfo* info) { |
- input_method::InputMethodManager* manager = |
- input_method::InputMethodManager::Get(); |
- input_method::InputMethodUtil* util = manager->GetInputMethodUtil(); |
- input_method::InputMethodDescriptor ime = |
- manager->GetActiveIMEState()->GetCurrentInputMethod(); |
- ExtractIMEInfo(ime, *util, info); |
- info->selected = true; |
-} |
- |
-void SystemTrayDelegateChromeOS::GetAvailableIMEList(ash::IMEInfoList* list) { |
- input_method::InputMethodManager* manager = |
- input_method::InputMethodManager::Get(); |
- input_method::InputMethodUtil* util = manager->GetInputMethodUtil(); |
- std::unique_ptr<input_method::InputMethodDescriptors> ime_descriptors( |
- manager->GetActiveIMEState()->GetActiveInputMethods()); |
- std::string current = |
- manager->GetActiveIMEState()->GetCurrentInputMethod().id(); |
- for (size_t i = 0; i < ime_descriptors->size(); i++) { |
- input_method::InputMethodDescriptor& ime = ime_descriptors->at(i); |
- ash::IMEInfo info; |
- ExtractIMEInfo(ime, *util, &info); |
- info.selected = ime.id() == current; |
- list->push_back(info); |
- } |
-} |
- |
-void SystemTrayDelegateChromeOS::GetCurrentIMEProperties( |
- ash::IMEPropertyInfoList* list) { |
- ui::ime::InputMethodMenuItemList menu_list = |
- ui::ime::InputMethodMenuManager::GetInstance()-> |
- GetCurrentInputMethodMenuItemList(); |
- for (size_t i = 0; i < menu_list.size(); ++i) { |
- ash::IMEPropertyInfo property; |
- property.key = menu_list[i].key; |
- property.name = base::UTF8ToUTF16(menu_list[i].label); |
- property.selected = menu_list[i].is_selection_item_checked; |
- list->push_back(property); |
- } |
-} |
- |
ash::NetworkingConfigDelegate* |
SystemTrayDelegateChromeOS::GetNetworkingConfigDelegate() const { |
return networking_config_delegate_.get(); |