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

Unified Diff: chromeos/ime/input_method_descriptor.cc

Issue 13459008: Support options page handling into ComponentExtensionManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix constructors. Created 7 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
« no previous file with comments | « chromeos/ime/input_method_descriptor.h ('k') | chromeos/ime/input_method_descriptor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/ime/input_method_descriptor.cc
diff --git a/chromeos/ime/input_method_descriptor.cc b/chromeos/ime/input_method_descriptor.cc
index 4ded5989d60476d578a25a4afc65bc763a2b205c..3ed8da34864280d0e56244d5709232f2844f9b5c 100644
--- a/chromeos/ime/input_method_descriptor.cc
+++ b/chromeos/ime/input_method_descriptor.cc
@@ -16,15 +16,18 @@ namespace {
const char kFallbackLayout[] = "us";
} // namespace
-InputMethodDescriptor::InputMethodDescriptor(const std::string& id,
- const std::string& name,
- const std::string& keyboard_layout,
- const std::string& language_code,
- bool third_party)
+InputMethodDescriptor::InputMethodDescriptor(
+ const std::string& id,
+ const std::string& name,
+ const std::string& keyboard_layout,
+ const std::string& language_code,
+ const std::string& options_page_url,
+ bool third_party)
: id_(id),
name_(name),
keyboard_layout_(keyboard_layout),
language_code_(language_code),
+ options_page_url_(options_page_url),
third_party_(third_party) {
}
@@ -51,6 +54,7 @@ InputMethodDescriptor::GetFallbackInputMethodDescriptor() {
"",
kFallbackLayout,
"en-US",
+ "", // options page, not available.
false);
}
@@ -60,6 +64,7 @@ std::string InputMethodDescriptor::ToString() const {
<< ", name=" << name()
<< ", keyboard_layout=" << keyboard_layout()
<< ", language_code=" << language_code()
+ << ", options_page_url=" << options_page_url()
<< ", third_party=" << third_party();
return stream.str();
}
« no previous file with comments | « chromeos/ime/input_method_descriptor.h ('k') | chromeos/ime/input_method_descriptor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698