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

Unified Diff: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h

Issue 2820823005: Revert of Stop passing raw pointers to base::Value API in c/b/ui (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h
diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h
index 0a657c14e9a8c7f550b403a5fe4a0a3cccf540e0..e2086e7ca62c6678d711cead3d966f3d0199d820 100644
--- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CROS_LANGUAGE_OPTIONS_HANDLER_H_
#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CROS_LANGUAGE_OPTIONS_HANDLER_H_
-#include <memory>
#include <string>
#include "base/compiler_specific.h"
@@ -13,10 +12,6 @@
#include "chrome/browser/ui/webui/options/language_options_handler.h"
#include "ui/base/ime/chromeos/component_extension_ime_manager.h"
#include "ui/base/ime/chromeos/input_method_descriptor.h"
-
-namespace base {
-class ListValue;
-}
namespace chromeos {
namespace options {
@@ -44,14 +39,13 @@
//
// Note that true in languageCodeSet does not mean anything. We just use
// the dictionary as a set.
- static std::unique_ptr<base::ListValue> GetInputMethodList();
+ static base::ListValue* GetInputMethodList();
// Converts input method descriptors to the list of input methods.
// The return value will look like:
// [{'id': '_ext_ime_nejguenhnsnjnwychcnsdsdjketest',
// 'displayName': 'Sample IME'}, ...]
- static std::unique_ptr<base::ListValue>
- ConvertInputMethodDescriptorsToIMEList(
+ static base::ListValue* ConvertInputMethodDescriptorsToIMEList(
const input_method::InputMethodDescriptors& descriptors);
private:

Powered by Google App Engine
This is Rietveld 408576698