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

Unified Diff: chrome/browser/chromeos/input_method/input_method_descriptor.h

Issue 10388181: Remove virtual keyboard support from input_method_descriptor.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 7 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/chromeos/input_method/input_method_descriptor.h
diff --git a/chrome/browser/chromeos/input_method/input_method_descriptor.h b/chrome/browser/chromeos/input_method/input_method_descriptor.h
index e23bfbd9835c8361ea83b61f7fc1a89122b520fc..231c1dbffbd48d3a3a3dddf34e044506d2be51c5 100644
--- a/chrome/browser/chromeos/input_method/input_method_descriptor.h
+++ b/chrome/browser/chromeos/input_method/input_method_descriptor.h
@@ -20,11 +20,10 @@ class InputMethodWhitelist;
class InputMethodDescriptor {
public:
InputMethodDescriptor();
- InputMethodDescriptor(const InputMethodWhitelist& whitelist,
- const std::string& in_id,
- const std::string& in_name,
- const std::string& in_raw_layout,
- const std::string& in_language_code);
+ InputMethodDescriptor(const std::string& id,
+ const std::string& name,
+ const std::string& keyboard_layout,
+ const std::string& language_code);
~InputMethodDescriptor();
bool operator==(const InputMethodDescriptor& other) const;
@@ -36,9 +35,6 @@ class InputMethodDescriptor {
const std::string& id() const { return id_; }
const std::string& name() const { return name_; }
const std::string& keyboard_layout() const { return keyboard_layout_; }
- const std::vector<std::string>& virtual_keyboard_layouts() const {
- return virtual_keyboard_layouts_;
- }
const std::string& language_code() const { return language_code_; }
// Returns the fallback input method descriptor (the very basic US
@@ -47,13 +43,6 @@ class InputMethodDescriptor {
static InputMethodDescriptor GetFallbackInputMethodDescriptor();
private:
- // For GetFallbackInputMethodDescriptor(). Use the public constructor instead.
- InputMethodDescriptor(const std::string& in_id,
- const std::string& in_name,
- const std::string& in_keyboard_layout,
- const std::string& in_virtual_keyboard_layouts,
- const std::string& in_language_code);
-
// An ID that identifies an input method engine (e.g., "t:latn-post",
// "pinyin", "hangul").
std::string id_;
@@ -63,9 +52,6 @@ class InputMethodDescriptor {
// A preferred physical keyboard layout for the input method (e.g., "us",
// "us(dvorak)", "jp"). Comma separated layout names do NOT appear.
std::string keyboard_layout_;
- // Preferred virtual keyboard layouts for the input method. Comma separated
- // layout names in order of priority, such as "handwriting,us", could appear.
- std::vector<std::string> virtual_keyboard_layouts_;
// Language code like "ko", "ja", "en-US", and "zh-CN".
std::string language_code_;
};

Powered by Google App Engine
This is Rietveld 408576698