Index: chrome/browser/extensions/extension_input_ime_api.cc |
diff --git a/chrome/browser/extensions/extension_input_ime_api.cc b/chrome/browser/extensions/extension_input_ime_api.cc |
index 662b5c2132ac47ea69a63698283cd6dcc2f8a641..00b5fdd0b33db161dbd3043786e95cde300cc044 100644 |
--- a/chrome/browser/extensions/extension_input_ime_api.cc |
+++ b/chrome/browser/extensions/extension_input_ime_api.cc |
@@ -44,7 +44,7 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { |
return; |
ListValue args; |
- args.Append(Value::CreateStringValue(engine_id)); |
+ args.Append(base::StringValue::New(engine_id)); |
std::string json_args; |
base::JSONWriter::Write(&args, false, &json_args); |
@@ -57,7 +57,7 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { |
return; |
ListValue args; |
- args.Append(Value::CreateStringValue(engine_id)); |
+ args.Append(base::StringValue::New(engine_id)); |
std::string json_args; |
base::JSONWriter::Write(&args, false, &json_args); |
@@ -87,7 +87,7 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { |
return; |
ListValue args; |
- args.Append(Value::CreateIntegerValue(context_id)); |
+ args.Append(base::NumberValue::New(context_id)); |
std::string json_args; |
base::JSONWriter::Write(&args, false, &json_args); |
@@ -128,7 +128,7 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { |
dict->SetBoolean("shiftKey", event.shift_key); |
ListValue args; |
- args.Append(Value::CreateStringValue(engine_id)); |
+ args.Append(base::StringValue::New(engine_id)); |
args.Append(dict); |
std::string json_args; |
@@ -144,21 +144,21 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { |
return; |
ListValue args; |
- args.Append(Value::CreateStringValue(engine_id)); |
- args.Append(Value::CreateIntegerValue(candidate_id)); |
+ args.Append(base::StringValue::New(engine_id)); |
+ args.Append(base::NumberValue::New(candidate_id)); |
switch (button) { |
case chromeos::InputMethodEngine::MOUSE_BUTTON_MIDDLE: |
- args.Append(Value::CreateStringValue("middle")); |
+ args.Append(base::StringValue::New("middle")); |
break; |
case chromeos::InputMethodEngine::MOUSE_BUTTON_RIGHT: |
- args.Append(Value::CreateStringValue("right")); |
+ args.Append(base::StringValue::New("right")); |
break; |
case chromeos::InputMethodEngine::MOUSE_BUTTON_LEFT: |
// Default to left. |
default: |
- args.Append(Value::CreateStringValue("left")); |
+ args.Append(base::StringValue::New("left")); |
break; |
} |
@@ -175,8 +175,8 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { |
return; |
ListValue args; |
- args.Append(Value::CreateStringValue(engine_id)); |
- args.Append(Value::CreateStringValue(menu_id)); |
+ args.Append(base::StringValue::New(engine_id)); |
+ args.Append(base::StringValue::New(menu_id)); |
std::string json_args; |
base::JSONWriter::Write(&args, false, &json_args); |
@@ -302,7 +302,7 @@ bool SetCompositionFunction::RunImpl() { |
GetActiveEngine(extension_id()); |
if (!engine) { |
if (has_callback()) { |
- result_.reset(Value::CreateBooleanValue(false)); |
+ result_.reset(base::FalseValue()); |
} |
return true; |
} |
@@ -361,12 +361,12 @@ bool SetCompositionFunction::RunImpl() { |
if (engine->SetComposition(context_id, text.c_str(), selection_start, |
selection_end, segments, &error)) { |
if (has_callback()) { |
- result_.reset(Value::CreateBooleanValue(true)); |
+ result_.reset(base::TrueValue()); |
} |
return true; |
} else { |
if (has_callback()) { |
- result_.reset(Value::CreateBooleanValue(false)); |
+ result_.reset(base::FalseValue()); |
} |
return false; |
} |
@@ -390,12 +390,12 @@ bool ClearCompositionFunction::RunImpl() { |
std::string error; |
if (engine->ClearComposition(context_id, &error)) { |
if (has_callback()) { |
- result_.reset(Value::CreateBooleanValue(true)); |
+ result_.reset(base::TrueValue()); |
} |
return true; |
} else { |
if (has_callback()) { |
- result_.reset(Value::CreateBooleanValue(false)); |
+ result_.reset(base::FalseValue()); |
} |
return false; |
} |
@@ -422,12 +422,12 @@ bool CommitTextFunction::RunImpl() { |
std::string error; |
if (engine->CommitText(context_id, text.c_str(), &error)) { |
if (has_callback()) { |
- result_.reset(Value::CreateBooleanValue(true)); |
+ result_.reset(base::TrueValue()); |
} |
return true; |
} else { |
if (has_callback()) { |
- result_.reset(Value::CreateBooleanValue(false)); |
+ result_.reset(base::FalseValue()); |
} |
return false; |
} |
@@ -499,7 +499,7 @@ bool SetCandidateWindowPropertiesFunction::RunImpl() { |
} |
if (has_callback()) { |
- result_.reset(Value::CreateBooleanValue(true)); |
+ result_.reset(base::TrueValue()); |
} |
return true; |
@@ -578,12 +578,12 @@ bool SetCandidatesFunction::RunImpl() { |
std::string error; |
if (engine->SetCandidates(context_id, candidates, &error)) { |
if (has_callback()) { |
- result_.reset(Value::CreateBooleanValue(true)); |
+ result_.reset(base::TrueValue()); |
} |
return true; |
} else { |
if (has_callback()) { |
- result_.reset(Value::CreateBooleanValue(false)); |
+ result_.reset(base::FalseValue()); |
} |
return false; |
} |
@@ -610,12 +610,12 @@ bool SetCursorPositionFunction::RunImpl() { |
std::string error; |
if (engine->SetCursorPosition(context_id, candidate_id, &error)) { |
if (has_callback()) { |
- result_.reset(Value::CreateBooleanValue(true)); |
+ result_.reset(base::TrueValue()); |
} |
return true; |
} else { |
if (has_callback()) { |
- result_.reset(Value::CreateBooleanValue(false)); |
+ result_.reset(base::FalseValue()); |
} |
return false; |
} |