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

Issue 130833002: Revert 243777 "Moves CandidateWindow model to ui/base/ime." (Closed)

Created:
6 years, 11 months ago by scottmg
Modified:
6 years, 11 months ago
Reviewers:
Jun Mukai
CC:
chromium-reviews
Visibility:
Public.

Description

Revert 243777 "Moves CandidateWindow model to ui/base/ime." Most CrOS failing similar to this: FAILED: c++ -MMD -MF obj/chrome/browser/chromeos/input_method/test_support_common.mock_input_method_engine.o.d -DV8_DEPRECATION_WARNINGS -D_FILE_OFFSET_BITS=64 -DCHROMIUM_BUILD -DTOOLKIT_VIEWS=1 -DUI_COMPOSITOR_IMAGE_TRANSPORT -DUSE_AURA=1 -DUSE_ASH=1 -DUSE_CAIRO=1 -DUSE_GLIB=1 -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_NSS=1 -DUSE_X11=1 -DOS_CHROMEOS=1 -DUSE_XI2_MT=2 -DFILE_MANAGER_EXTENSION=1 -DIMAGE_LOADER_EXTENSION=1 -DENABLE_REMOTING=1 -DENABLE_WEBRTC=1 -DUSE_PROPRIETARY_CODECS -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_INPUT_SPEECH -DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DUSE_UDEV -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC -DENABLE_EGLIMAGE=1 -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_AUTOMATION=1 -DENABLE_GOOGLE_NOW=1 -DCLD_VERSION=2 -DENABLE_FULL_PRINTING=1 -DENABLE_PRINTING=1 -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_MANAGED_USERS=1 -DENABLE_MDNS=1 -DGL_GLEXT_PROTOTYPES -DLIBPEERCONNECTION_LIB=1 -DUSE_BRLAPI -DGTEST_HAS_POSIX_RE=0 -DNACL_WINDOWS=0 -DNACL_LINUX=1 -DNACL_OSX=0 -DNACL_TARGET_SUBARCH=64 -DNACL_TARGET_ARCH=x86 -DNACL_BUILD_SUBARCH=64 -DNACL_BUILD_ARCH=x86 -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DU_USING_ICU_NAMESPACE=0 -DU_STATIC_IMPLEMENTATION -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DSK_ENABLE_INST_COUNT=0 -DSK_SUPPORT_GPU=1 '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' -DSK_ENABLE_LEGACY_API_ALIASING=1 -DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1 -DSK_SUPPORT_LEGACY_COLORTYPE=1 -DGR_GL_IGNORE_ES3_MSAA=0 -DSK_SUPPORT_LEGACY_SK64 -DSK_SUPPORT_LEGACY_ONLOCKPIXELS -DSK_USE_POSIX_THREADS -DSK_DEFERRED_CANVAS_USES_FACTORIES=1 -DFEATURE_ENABLE_SSL -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH -DJSONCPP_RELATIVE_PATH -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -DLINUX -DPOSIX -DCHROMEOS -DUNIT_TEST -DGTEST_HAS_RTTI=0 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_FORTIFY_SOURCE=2 -I../.. -I../../skia/config -I../../third_party/khronos -I../../gpu -I../../third_party/WebKit/Source -Igen -Igen/chrome -Igen/protoc_out -I../../third_party/protobuf -I../../third_party/protobuf/src -I../../third_party/WebKit -I../../third_party/icu/source/common -I../../third_party/npapi -I../../third_party/npapi/bindings -I../../v8/include -I../../third_party/libpng -I../../third_party/libwebp -I../../third_party/ots/include -I../../third_party/qcms/src -I../../third_party/iccjpeg -I../../third_party/libjpeg -I../../third_party/skia/src/core -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/pdf -I../../third_party/skia/include/gpu -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../skia/ext -I../../third_party/libjingle/overrides -I../../third_party/libjingle/source -I../../testing/gtest/include -I../../third_party -I../../third_party/webrtc -I../../third_party/jsoncpp/overrides/include -I../../third_party/jsoncpp/source/include -I../../third_party/cacheinvalidation/overrides -I../../third_party/cacheinvalidation/src -I../../testing/gmock/include -I../../third_party/zlib -I../../third_party/leveldatabase/src/include -I../../third_party/leveldatabase/src -I../../third_party/leveldatabase -Igen/policy -I../../net/third_party/nss/ssl -Werror -pthread -fno-exceptions -fno-strict-aliasing -Wall -Wno-unused-parameter -Wno-missing-field-initializers -fvisibility=hidden -pipe -fPIC -pthread -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/nss -I/usr/include/nspr -O2 -fno-ident -fdata-sections -ffunction-sections -fno-rtti -fno-threadsafe-statics -fvisibility-inlines-hidden -Wsign-compare -c ../../chrome/browser/chromeos/input_method/mock_input_method_engine.cc -o obj/chrome/browser/chromeos/input_method/test_support_common.mock_input_method_engine.o ../../chrome/browser/chromeos/input_method/mock_input_method_engine.cc:14:43: fatalerror: chromeos/ime/candidate_window.h: No such file or directory compilation terminated. ninja: build stopped: subcommand failed. > Moves CandidateWindow model to ui/base/ime. > > BUG=325813 > R=komatsu@chromium.org > TEST=build passes > > Review URL: https://codereview.chromium.org/126363002 TBR=mukai@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=243784

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+104 lines, -445 lines) Patch
M trunk/src/chrome/browser/chromeos/input_method/candidate_view.h View 4 chunks +4 lines, -4 lines 0 comments Download
M trunk/src/chrome/browser/chromeos/input_method/candidate_view.cc View 10 chunks +14 lines, -15 lines 0 comments Download
M trunk/src/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h View 3 chunks +4 lines, -8 lines 0 comments Download
M trunk/src/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc View 4 chunks +4 lines, -3 lines 0 comments Download
M trunk/src/chrome/browser/chromeos/input_method/candidate_window_controller_impl_unittest.cc View 4 chunks +10 lines, -10 lines 0 comments Download
M trunk/src/chrome/browser/chromeos/input_method/candidate_window_view.h View 3 chunks +4 lines, -5 lines 0 comments Download
M trunk/src/chrome/browser/chromeos/input_method/candidate_window_view.cc View 7 chunks +12 lines, -11 lines 0 comments Download
M trunk/src/chrome/browser/chromeos/input_method/candidate_window_view_unittest.cc View 12 chunks +25 lines, -26 lines 0 comments Download
M trunk/src/chrome/browser/chromeos/input_method/input_method_engine.h View 3 chunks +2 lines, -2 lines 0 comments Download
M trunk/src/chrome/browser/chromeos/input_method/input_method_engine.cc View 5 chunks +4 lines, -4 lines 0 comments Download
M trunk/src/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc View 7 chunks +11 lines, -11 lines 0 comments Download
M trunk/src/chromeos/chromeos.gyp View 2 chunks +3 lines, -0 lines 0 comments Download
A + trunk/src/chromeos/ime/candidate_window.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + trunk/src/chromeos/ime/candidate_window.cc View 0 chunks +-1 lines, --1 lines 0 comments Download
A + trunk/src/chromeos/ime/candidate_window_unittest.cc View 0 chunks +-1 lines, --1 lines 0 comments Download
D trunk/src/ui/base/ime/candidate_window.h View 1 chunk +0 lines, -125 lines 0 comments Download
D trunk/src/ui/base/ime/candidate_window.cc View 1 chunk +0 lines, -76 lines 0 comments Download
D trunk/src/ui/base/ime/candidate_window_unittest.cc View 1 chunk +0 lines, -138 lines 0 comments Download
M trunk/src/ui/base/ime/chromeos/ibus_bridge.h View 2 chunks +6 lines, -3 lines 0 comments Download
M trunk/src/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h View 3 chunks +3 lines, -3 lines 0 comments Download
M trunk/src/ui/base/ime/chromeos/mock_ime_candidate_window_handler.cc View 1 chunk +1 line, -1 line 0 comments Download
M trunk/src/ui/base/ime/ime.gypi View 1 chunk +0 lines, -2 lines 0 comments Download
M trunk/src/ui/base/ime/ime_unittests.gypi View 1 chunk +0 lines, -1 line 0 comments Download

Messages

Total messages: 2 (0 generated)
scottmg
6 years, 11 months ago (2014-01-09 05:24:07 UTC) #1
scottmg
6 years, 11 months ago (2014-01-09 05:24:26 UTC) #2
Message was sent while issue was closed.
Committed patchset #1 manually as r243784.

Powered by Google App Engine
This is Rietveld 408576698