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

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

Issue 2771233002: Remove the wrapper functions content::RecordAction et al (Closed)
Patch Set: Rebased Created 3 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 (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/chromeos/cros_language_options_handler .h" 5 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/bind_helpers.h" 13 #include "base/bind_helpers.h"
14 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
15 #include "base/metrics/user_metrics.h"
15 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
16 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
17 #include "base/values.h" 18 #include "base/values.h"
18 #include "chrome/app/chrome_command_ids.h" 19 #include "chrome/app/chrome_command_ids.h"
19 #include "chrome/browser/chromeos/input_method/input_method_util.h" 20 #include "chrome/browser/chromeos/input_method/input_method_util.h"
20 #include "chrome/browser/chromeos/profiles/profile_helper.h" 21 #include "chrome/browser/chromeos/profiles/profile_helper.h"
21 #include "chrome/browser/extensions/extension_tab_util.h" 22 #include "chrome/browser/extensions/extension_tab_util.h"
22 #include "chrome/browser/lifetime/application_lifetime.h" 23 #include "chrome/browser/lifetime/application_lifetime.h"
23 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/ui/browser.h" 25 #include "chrome/browser/ui/browser.h"
25 #include "chrome/browser/ui/browser_finder.h" 26 #include "chrome/browser/ui/browser_finder.h"
26 #include "chrome/browser/ui/browser_window.h" 27 #include "chrome/browser/ui/browser_window.h"
27 #include "chrome/browser/ui/tabs/tab_strip_model.h" 28 #include "chrome/browser/ui/tabs/tab_strip_model.h"
28 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" 29 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
29 #include "chrome/grit/chromium_strings.h" 30 #include "chrome/grit/chromium_strings.h"
30 #include "chrome/grit/generated_resources.h" 31 #include "chrome/grit/generated_resources.h"
31 #include "components/strings/grit/components_strings.h" 32 #include "components/strings/grit/components_strings.h"
32 #include "components/user_manager/user_manager.h" 33 #include "components/user_manager/user_manager.h"
33 #include "components/user_manager/user_type.h" 34 #include "components/user_manager/user_type.h"
34 #include "content/public/browser/navigation_controller.h" 35 #include "content/public/browser/navigation_controller.h"
35 #include "content/public/browser/user_metrics.h"
36 #include "content/public/browser/web_contents.h" 36 #include "content/public/browser/web_contents.h"
37 #include "extensions/browser/extension_registry.h" 37 #include "extensions/browser/extension_registry.h"
38 #include "extensions/common/extension.h" 38 #include "extensions/common/extension.h"
39 #include "extensions/common/manifest_url_handlers.h" 39 #include "extensions/common/manifest_url_handlers.h"
40 #include "ui/base/ime/chromeos/component_extension_ime_manager.h" 40 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"
41 #include "ui/base/ime/chromeos/extension_ime_util.h" 41 #include "ui/base/ime/chromeos/extension_ime_util.h"
42 #include "ui/base/ime/chromeos/input_method_manager.h" 42 #include "ui/base/ime/chromeos/input_method_manager.h"
43 #include "ui/base/l10n/l10n_util.h" 43 #include "ui/base/l10n/l10n_util.h"
44 44
45 using base::UserMetricsAction; 45 using base::UserMetricsAction;
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 ProfileHelper::Get()->GetUserByProfile(profile); 201 ProfileHelper::Get()->GetUserByProfile(profile);
202 if (user && 202 if (user &&
203 user->GetAccountId() == user_manager->GetPrimaryUser()->GetAccountId() && 203 user->GetAccountId() == user_manager->GetPrimaryUser()->GetAccountId() &&
204 user->GetType() != user_manager::USER_TYPE_PUBLIC_ACCOUNT) { 204 user->GetType() != user_manager::USER_TYPE_PUBLIC_ACCOUNT) {
205 profile->ChangeAppLocale(language_code, 205 profile->ChangeAppLocale(language_code,
206 Profile::APP_LOCALE_CHANGED_VIA_SETTINGS); 206 Profile::APP_LOCALE_CHANGED_VIA_SETTINGS);
207 } 207 }
208 } 208 }
209 209
210 void CrosLanguageOptionsHandler::RestartCallback(const base::ListValue* args) { 210 void CrosLanguageOptionsHandler::RestartCallback(const base::ListValue* args) {
211 content::RecordAction(UserMetricsAction("LanguageOptions_SignOut")); 211 base::RecordAction(UserMetricsAction("LanguageOptions_SignOut"));
212 chrome::AttemptUserExit(); 212 chrome::AttemptUserExit();
213 } 213 }
214 214
215 void CrosLanguageOptionsHandler::InputMethodDisableCallback( 215 void CrosLanguageOptionsHandler::InputMethodDisableCallback(
216 const base::ListValue* args) { 216 const base::ListValue* args) {
217 const std::string input_method_id = 217 const std::string input_method_id =
218 base::UTF16ToASCII(ExtractStringValue(args)); 218 base::UTF16ToASCII(ExtractStringValue(args));
219 const std::string action = base::StringPrintf( 219 const std::string action = base::StringPrintf(
220 "LanguageOptions_DisableInputMethod_%s", input_method_id.c_str()); 220 "LanguageOptions_DisableInputMethod_%s", input_method_id.c_str());
221 content::RecordComputedAction(action); 221 base::RecordComputedAction(action);
222 } 222 }
223 223
224 void CrosLanguageOptionsHandler::InputMethodEnableCallback( 224 void CrosLanguageOptionsHandler::InputMethodEnableCallback(
225 const base::ListValue* args) { 225 const base::ListValue* args) {
226 const std::string input_method_id = 226 const std::string input_method_id =
227 base::UTF16ToASCII(ExtractStringValue(args)); 227 base::UTF16ToASCII(ExtractStringValue(args));
228 const std::string action = base::StringPrintf( 228 const std::string action = base::StringPrintf(
229 "LanguageOptions_EnableInputMethod_%s", input_method_id.c_str()); 229 "LanguageOptions_EnableInputMethod_%s", input_method_id.c_str());
230 content::RecordComputedAction(action); 230 base::RecordComputedAction(action);
231 } 231 }
232 232
233 void CrosLanguageOptionsHandler::InputMethodOptionsOpenCallback( 233 void CrosLanguageOptionsHandler::InputMethodOptionsOpenCallback(
234 const base::ListValue* args) { 234 const base::ListValue* args) {
235 const std::string input_method_id = 235 const std::string input_method_id =
236 base::UTF16ToASCII(ExtractStringValue(args)); 236 base::UTF16ToASCII(ExtractStringValue(args));
237 const std::string extension_id = 237 const std::string extension_id =
238 extension_ime_util::GetExtensionIDFromInputMethodID(input_method_id); 238 extension_ime_util::GetExtensionIDFromInputMethodID(input_method_id);
239 if (extension_id.empty()) 239 if (extension_id.empty())
240 return; 240 return;
(...skipping 28 matching lines...) Expand all
269 extension_ime_util::GetExtensionIDFromInputMethodID(input_method_id); 269 extension_ime_util::GetExtensionIDFromInputMethodID(input_method_id);
270 const extensions::Extension* extension = 270 const extensions::Extension* extension =
271 enabled_extensions.GetByID(extension_id); 271 enabled_extensions.GetByID(extension_id);
272 if (extension) 272 if (extension)
273 entry->SetString("extensionName", extension->name()); 273 entry->SetString("extensionName", extension->name());
274 } 274 }
275 } 275 }
276 276
277 } // namespace options 277 } // namespace options
278 } // namespace chromeos 278 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698