Update to Chromium revision 275973.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1743 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-06-12 20:28:58 +00:00
parent 4e0dddcfa8
commit de5b859c0a
36 changed files with 188 additions and 175 deletions

View File

@@ -37,7 +37,7 @@
#endif
#endif // defined(USE_AURA)
#if defined(USE_AURA) && defined(USE_X11)
#if defined(USE_AURA) && defined(OS_LINUX)
#include "ui/base/ime/input_method_initializer.h"
#endif
@@ -59,7 +59,7 @@ void CefBrowserMainParts::PreMainMessageLoopStart() {
}
void CefBrowserMainParts::PreEarlyInitialization() {
#if defined(USE_AURA) && defined(USE_X11)
#if defined(USE_AURA) && defined(OS_LINUX)
// TODO(linux): Consider using a real input method or
// views::LinuxUI::SetInstance.
ui::InitializeInputMethodForTesting();