summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/cros
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-27 00:47:12 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-27 00:47:12 +0000
commit1432134037ad43dc3bf4413d49d0b9ce78b6039f (patch)
tree6831e235d740c18947dbfde3b156b7e4d5954510 /chrome/browser/chromeos/cros
parent9bb757c47a73262ca936fa4beceefbd08bf69ff2 (diff)
downloadchromium_src-1432134037ad43dc3bf4413d49d0b9ce78b6039f.zip
chromium_src-1432134037ad43dc3bf4413d49d0b9ce78b6039f.tar.gz
chromium_src-1432134037ad43dc3bf4413d49d0b9ce78b6039f.tar.bz2
Checking in http://codereview.chromium.org/2806070 and http://codereview.chromium.org/3028018 on behalf of zbehan@.
third_party: add a stub cros directory and cros_api.gyp for libcros to satisfy gyp depdendencies cros: fix more of the third_party includes, forbid similar includes for future BUG=none TEST=make sure both chrome and chromeos builds are happy. TBR=zelidrag Review URL: http://codereview.chromium.org/3035021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/cros')
-rw-r--r--chrome/browser/chromeos/cros/input_method_library.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/cros/input_method_library.cc b/chrome/browser/chromeos/cros/input_method_library.cc
index 664b745..60a164c 100644
--- a/chrome/browser/chromeos/cros/input_method_library.cc
+++ b/chrome/browser/chromeos/cros/input_method_library.cc
@@ -191,8 +191,8 @@ void InputMethodLibraryImpl::FlushImeConfig() {
active_input_methods_are_changed = true;
}
} else {
- LOG(ERROR) << "chromeos::SetImeConfig failed. Will retry later: "
- << section << "/" << config_name;
+// LOG(ERROR) << "chromeos::SetImeConfig failed. Will retry later: "
+// << section << "/" << config_name;
++iter; // Do not remove the command.
}
}