summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authoryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 09:32:03 +0000
committeryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 09:32:03 +0000
commitc2fd7b445e7ef6fd888d4de9d12b4384dbbbf637 (patch)
tree835d1d73ceee92cf008a562a67d0569f70fcedfa /chrome/browser/extensions
parent9b147aed36f3cc139fcb9ce13d9146167bb13db4 (diff)
downloadchromium_src-c2fd7b445e7ef6fd888d4de9d12b4384dbbbf637.zip
chromium_src-c2fd7b445e7ef6fd888d4de9d12b4384dbbbf637.tar.gz
chromium_src-c2fd7b445e7ef6fd888d4de9d12b4384dbbbf637.tar.bz2
Pass a correct button name to OnCandidateClicked()
- Found by GCC 4.6: chrome/browser/chromeos/input_method/input_method_engine.cc:508:7: warning: variable 'pressed_button' set but not used [-Wunused-but-set-variable] - To prevent this kind of error, added explicit types to enums in the class. BUG=None TEST=try Review URL: http://codereview.chromium.org/8498003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_input_ime_api.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_input_ime_api.cc b/chrome/browser/extensions/extension_input_ime_api.cc
index 098a894..c54f5b9c 100644
--- a/chrome/browser/extensions/extension_input_ime_api.cc
+++ b/chrome/browser/extensions/extension_input_ime_api.cc
@@ -37,7 +37,8 @@ bool ReadMenuItems(
std::string id;
std::string label;
- int style = chromeos::InputMethodEngine::MENU_ITEM_STYLE_NONE;
+ chromeos::InputMethodEngine::MenuItemStyle style =
+ chromeos::InputMethodEngine::MENU_ITEM_STYLE_NONE;
bool visible = true;
bool enabled = true;
bool checked = false;
@@ -295,9 +296,10 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer {
extension_id_, events::kOnKeyEvent, json_args, profile_, GURL());
}
- virtual void OnCandidateClicked(const std::string& engine_id,
- int candidate_id,
- int button) {
+ virtual void OnCandidateClicked(
+ const std::string& engine_id,
+ int candidate_id,
+ chromeos::InputMethodEngine::MouseButtonEvent button) {
if (profile_ == NULL || extension_id_.empty())
return;