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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 1523593002: Add an option in language settings for activating the IME menu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename function ImeMenuEnabled() as IsImeMenuEnabled() Created 4 years, 11 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/ui/webui/options/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 chromeos::switches::WakeOnWifiEnabled()); 687 chromeos::switches::WakeOnWifiEnabled());
688 const bool have_disable_time_zone_tracking_option_switch = 688 const bool have_disable_time_zone_tracking_option_switch =
689 base::CommandLine::ForCurrentProcess()->HasSwitch( 689 base::CommandLine::ForCurrentProcess()->HasSwitch(
690 chromeos::switches::kDisableTimeZoneTrackingOption); 690 chromeos::switches::kDisableTimeZoneTrackingOption);
691 values->SetBoolean("enableTimeZoneTrackingOption", 691 values->SetBoolean("enableTimeZoneTrackingOption",
692 !have_disable_time_zone_tracking_option_switch && 692 !have_disable_time_zone_tracking_option_switch &&
693 !chromeos::system::HasSystemTimezonePolicy()); 693 !chromeos::system::HasSystemTimezonePolicy());
694 values->SetBoolean("resolveTimezoneByGeolocationInitialValue", 694 values->SetBoolean("resolveTimezoneByGeolocationInitialValue",
695 Profile::FromWebUI(web_ui())->GetPrefs()->GetBoolean( 695 Profile::FromWebUI(web_ui())->GetPrefs()->GetBoolean(
696 prefs::kResolveTimezoneByGeolocation)); 696 prefs::kResolveTimezoneByGeolocation));
697 values->SetBoolean("enableLanguageOptionsImeMenu",
698 chromeos::switches::IsImeMenuEnabled());
697 #endif 699 #endif
698 } 700 }
699 701
700 #if defined(ENABLE_PRINT_PREVIEW) 702 #if defined(ENABLE_PRINT_PREVIEW)
701 void BrowserOptionsHandler::RegisterCloudPrintValues( 703 void BrowserOptionsHandler::RegisterCloudPrintValues(
702 base::DictionaryValue* values) { 704 base::DictionaryValue* values) {
703 values->SetString("cloudPrintOptionLabel", 705 values->SetString("cloudPrintOptionLabel",
704 l10n_util::GetStringFUTF16( 706 l10n_util::GetStringFUTF16(
705 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL, 707 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL,
706 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT))); 708 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)));
(...skipping 1441 matching lines...) Expand 10 before | Expand all | Expand 10 after
2148 2150
2149 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2151 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2150 #if defined(OS_CHROMEOS) 2152 #if defined(OS_CHROMEOS)
2151 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2153 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2152 #else 2154 #else
2153 return true; 2155 return true;
2154 #endif 2156 #endif
2155 } 2157 }
2156 2158
2157 } // namespace options 2159 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698