diff options
| author | shuchen <shuchen@chromium.org> | 2014-11-27 09:24:40 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-27 17:24:58 +0000 |
| commit | 179b1f4f701238db40a8fbdb90d66c6a7ba1c2aa (patch) | |
| tree | 2cddec8123f47ceab1e7f6f4aff8eb7f5ddad77a /ui/chromeos | |
| parent | e6828dda7fbcc1c55cdb85639a3e4aa0d78e9647 (diff) | |
| download | chromium_src-179b1f4f701238db40a8fbdb90d66c6a7ba1c2aa.zip chromium_src-179b1f4f701238db40a8fbdb90d66c6a7ba1c2aa.tar.gz chromium_src-179b1f4f701238db40a8fbdb90d66c6a7ba1c2aa.tar.bz2 | |
Revert "Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (patchset #18 id:340001 of https://codereview.chromium.org/727143002/)"
This reverts commit 857735b6255938981bf2dec4aee80e7bc6523631.
This is the 2nd attempt of cl https://codereview.chromium.org/727143002,
which broke build of Linux ChromiumOS GN.
This cl removes the entries of mock_component_extension_ime_manager_delegate.{cc|h}
in chromeos/ime/BUILD.gn file which should fix the problem.
TBR=stevenjb@chromium.org,pkasting@chromium.org,sky@chromium.org,mukai@chromium.org,derat@chromium.org
BUG=431863
TEST=Verified on linux_chromeos.
Review URL: https://codereview.chromium.org/765833002
Cr-Commit-Position: refs/heads/master@{#306002}
Diffstat (limited to 'ui/chromeos')
| -rw-r--r-- | ui/chromeos/ime/candidate_view.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/chromeos/ime/candidate_view.h b/ui/chromeos/ime/candidate_view.h index d781399..e839df4e 100644 --- a/ui/chromeos/ime/candidate_view.h +++ b/ui/chromeos/ime/candidate_view.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_IME_CANDIDATE_VIEW_H_ -#define ASH_IME_CANDIDATE_VIEW_H_ +#ifndef UI_CHROMEOS_IME_CANDIDATE_VIEW_H_ +#define UI_CHROMEOS_IME_CANDIDATE_VIEW_H_ #include "base/gtest_prod_util.h" #include "ui/base/ime/candidate_window.h" |