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

Issue 389913002: Moving IME manifests to chrome resources. (Closed)

Created:
6 years, 5 months ago by Shu Chen
Modified:
6 years, 4 months ago
CC:
chromium-reviews, dbeam+watch-options_chromium.org, extensions-reviews_chromium.org, oshima+watch_chromium.org, plundblad+watch_chromium.org, yukishiino+watch_chromium.org, aboxhall+watch_chromium.org, arv+watch_chromium.org, yuzo+watch_chromium.org, nona+watch_chromium.org, yusukes+watch_chromium.org, dmazzoni+watch_chromium.org, dtseng+watch_chromium.org, chromium-apps-reviews_chromium.org, stevenjb+watch_chromium.org, davemoore+watch_chromium.org, nkostylev+watch_chromium.org, Alexander Alekseev, Dmitry Polukhin, michaelpg
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Project:
chromium
Visibility:
Public.

Description

Moving IME manifests to chrome resources. BUG=378348, 391778 TEST=Verified on sandbox, Pixel device. And made sure no test is broken. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=285905

Patch Set 1 #

Total comments: 12

Patch Set 2 : modified per comments, and add OWNERS for input method manifest resources. #

Patch Set 3 : . #

Total comments: 12

Patch Set 4 : revised per review comments. #

Patch Set 5 : updated manifest files. #

Total comments: 2

Patch Set 6 : modified per review comments and update the xkb names to put "keyboard" as prefix instead of subfix. #

Patch Set 7 : #

Patch Set 8 : fixed unit_tests. #

Total comments: 2

Patch Set 9 : updated manifests. #

Patch Set 10 : rebased. #

Total comments: 14

Patch Set 11 : modified per comments. #

Total comments: 6

Patch Set 12 : rebased + nits. #

Patch Set 13 : fixed an issue that IME VK doesn't work at login screen. #

Patch Set 14 : rebased. #

Patch Set 15 : updated xkb_manifest.json, and made sure extensions can be loaded whenever EnableLoginLayouts(). #

Patch Set 16 : removed duplicated XKB extension loading. #

Total comments: 1
Unified diffs Side-by-side diffs Delta from patch set Stats (+2758 lines, -567 lines) Patch
M chrome/app/chromeos_strings.grdp View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 chunk +359 lines, -2 lines 0 comments Download
M chrome/browser/browser_resources.grd View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 chunk +16 lines, -0 lines 0 comments Download
M chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 chunk +0 lines, -6 lines 0 comments Download
M chrome/browser/chromeos/chrome_browser_main_chromeos.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 5 chunks +5 lines, -14 lines 0 comments Download
M chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h View 1 2 3 2 chunks +4 lines, -23 lines 0 comments Download
M chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc View 1 2 3 4 5 6 7 8 9 10 11 11 chunks +237 lines, -125 lines 1 comment Download
M chrome/browser/chromeos/input_method/input_method_configuration.h View 1 chunk +1 line, -3 lines 0 comments Download
M chrome/browser/chromeos/input_method/input_method_configuration.cc View 2 chunks +3 lines, -7 lines 0 comments Download
M chrome/browser/chromeos/input_method/input_method_configuration_unittest.cc View 2 chunks +1 line, -6 lines 0 comments Download
M chrome/browser/chromeos/input_method/input_method_engine.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 chunk +1 line, -2 lines 0 comments Download
M chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 chunk +0 lines, -11 lines 0 comments Download
M chrome/browser/chromeos/input_method/input_method_manager_impl.h View 1 2 3 4 chunks +1 line, -20 lines 0 comments Download
M chrome/browser/chromeos/input_method/input_method_manager_impl.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 9 chunks +15 lines, -73 lines 0 comments Download
M chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc View 1 chunk +0 lines, -67 lines 0 comments Download
M chrome/browser/chromeos/input_method/input_method_util.h View 1 chunk +1 line, -5 lines 0 comments Download
M chrome/browser/chromeos/input_method/input_method_util.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 1 chunk +4 lines, -9 lines 0 comments Download
M chrome/browser/chromeos/input_method/input_method_util_unittest.cc View 1 chunk +2 lines, -1 line 0 comments Download
M chrome/browser/chromeos/input_method/mock_input_method_manager.h View 2 chunks +1 line, -1 line 0 comments Download
M chrome/browser/chromeos/input_method/mock_input_method_manager.cc View 2 chunks +4 lines, -1 line 0 comments Download
M chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc View 1 chunk +0 lines, -10 lines 0 comments Download
M chrome/browser/extensions/component_loader.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 3 chunks +12 lines, -0 lines 0 comments Download
M chrome/browser/resources/chromeos/braille_ime/manifest.json View 1 2 1 chunk +1 line, -0 lines 0 comments Download
A chrome/browser/resources/chromeos/input_method/OWNERS View 1 2 3 4 5 6 7 8 9 10 1 chunk +4 lines, -0 lines 0 comments Download
A chrome/browser/resources/chromeos/input_method/cangjie_manifest.json View 1 2 3 4 5 6 7 8 1 chunk +25 lines, -0 lines 0 comments Download
A chrome/browser/resources/chromeos/input_method/google_input_tools_manifest.json View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +570 lines, -0 lines 0 comments Download
A chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json View 1 2 3 4 5 6 7 8 9 10 11 12 13 1 chunk +566 lines, -0 lines 0 comments Download
A chrome/browser/resources/chromeos/input_method/hangul_manifest.json View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +69 lines, -0 lines 0 comments Download
A chrome/browser/resources/chromeos/input_method/m17n_manifest.json View 1 2 3 4 1 chunk +185 lines, -0 lines 0 comments Download
A chrome/browser/resources/chromeos/input_method/mozc_manifest.json View 1 2 3 4 5 6 7 8 1 chunk +36 lines, -0 lines 0 comments Download
A chrome/browser/resources/chromeos/input_method/pinyin_manifest.json View 1 2 3 4 5 6 7 8 1 chunk +27 lines, -0 lines 0 comments Download
A chrome/browser/resources/chromeos/input_method/xkb_manifest.json View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 chunk +560 lines, -0 lines 0 comments Download
A chrome/browser/resources/chromeos/input_method/zhuyin_manifest.json View 1 2 3 4 5 6 7 8 1 chunk +27 lines, -0 lines 0 comments Download
M chrome/browser/resources/options/language_options.js View 1 2 3 4 5 6 7 8 9 10 11 12 13 4 chunks +5 lines, -7 lines 0 comments Download
M chrome/browser/ui/webui/chromeos/login/l10n_util.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 2 chunks +2 lines, -10 lines 0 comments Download
M chrome/browser/ui/webui/chromeos/login/network_screen_handler.h View 1 2 3 4 5 6 7 8 9 10 11 3 chunks +0 lines, -8 lines 0 comments Download
M chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc View 1 2 3 4 5 6 7 8 9 10 11 4 chunks +0 lines, -17 lines 0 comments Download
M chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h View 1 2 3 4 5 6 7 8 9 10 11 12 2 chunks +1 line, -14 lines 0 comments Download
M chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 3 chunks +5 lines, -63 lines 0 comments Download
M chromeos/ime/component_extension_ime_manager.h View 4 chunks +0 lines, -21 lines 0 comments Download
M chromeos/ime/component_extension_ime_manager.cc View 3 chunks +1 line, -23 lines 0 comments Download
M chromeos/ime/component_extension_ime_manager_unittest.cc View 3 chunks +2 lines, -18 lines 0 comments Download
M chromeos/ime/ime_keyboard_x11.cc View 1 chunk +2 lines, -0 lines 0 comments Download
M chromeos/ime/input_method_manager.h View 1 chunk +3 lines, -0 lines 0 comments Download

Messages

Total messages: 31 (0 generated)
Shu Chen
Nona/Nikita/Nico, can you please help to review this cl? Thanks
6 years, 5 months ago (2014-07-14 04:48:31 UTC) #1
Nikita (slow)
+Dmitry to review chrome/browser/resources/chromeos/* +Alexander to review chrome/browser/ui/webui/options/chromeos/* chrome/browser/ui/webui/chromeos/login/*
6 years, 5 months ago (2014-07-14 05:29:29 UTC) #2
Shu Chen
nona@ for IMF related changes. nkostylev@/dpolukhin@ for other changes under: - chrome/browser/chromeos - chrome/browser/resources/chromeos - ...
6 years, 5 months ago (2014-07-14 05:33:07 UTC) #3
nona
Cool refactoring! https://codereview.chromium.org/389913002/diff/1/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc File chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc (right): https://codereview.chromium.org/389913002/diff/1/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc#newcode34 chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc:34: struct WhitelistedComponentExtensionIME { Do we still needs ...
6 years, 5 months ago (2014-07-14 06:03:49 UTC) #4
nona
https://codereview.chromium.org/389913002/diff/1/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc File chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc (left): https://codereview.chromium.org/389913002/diff/1/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc#oldcode32 chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc:32: const char* path; Can we move this entry into ...
6 years, 5 months ago (2014-07-14 06:46:08 UTC) #5
Shu Chen
https://codereview.chromium.org/389913002/diff/1/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc File chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc (left): https://codereview.chromium.org/389913002/diff/1/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc#oldcode32 chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc:32: const char* path; On 2014/07/14 06:46:07, nona wrote: > ...
6 years, 5 months ago (2014-07-14 08:53:45 UTC) #6
nona
almost lgtm, please address my few comments :) https://codereview.chromium.org/389913002/diff/40001/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc File chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc (right): https://codereview.chromium.org/389913002/diff/40001/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc#newcode324 chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc:324: out->display_name ...
6 years, 5 months ago (2014-07-14 10:02:47 UTC) #7
Alexander Alekseev
https://codereview.chromium.org/389913002/diff/40001/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h File chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h (right): https://codereview.chromium.org/389913002/diff/40001/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h#newcode43 chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h:43: // file thread. Is this comment still valid: "must ...
6 years, 5 months ago (2014-07-14 14:07:29 UTC) #8
Shu Chen
https://codereview.chromium.org/389913002/diff/40001/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc File chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc (right): https://codereview.chromium.org/389913002/diff/40001/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc#newcode324 chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc:324: out->display_name = l10n_util::GetStringUTF8(p->resource_id); On 2014/07/14 10:02:47, nona wrote: > ...
6 years, 5 months ago (2014-07-14 15:07:21 UTC) #9
Alexander Alekseev
lgtm Thank you for this refactoring!
6 years, 5 months ago (2014-07-14 15:21:11 UTC) #10
Dmitry Polukhin
https://codereview.chromium.org/389913002/diff/80001/chrome/browser/chromeos/chrome_browser_main_chromeos.cc File chrome/browser/chromeos/chrome_browser_main_chromeos.cc (right): https://codereview.chromium.org/389913002/diff/80001/chrome/browser/chromeos/chrome_browser_main_chromeos.cc#newcode635 chrome/browser/chromeos/chrome_browser_main_chromeos.cc:635: input_method::InputMethodManager::Get()->InitializeComponentExtension(); As far as I understand it is the ...
6 years, 5 months ago (2014-07-15 15:13:31 UTC) #11
Shu Chen
https://codereview.chromium.org/389913002/diff/80001/chrome/browser/chromeos/chrome_browser_main_chromeos.cc File chrome/browser/chromeos/chrome_browser_main_chromeos.cc (right): https://codereview.chromium.org/389913002/diff/80001/chrome/browser/chromeos/chrome_browser_main_chromeos.cc#newcode635 chrome/browser/chromeos/chrome_browser_main_chromeos.cc:635: input_method::InputMethodManager::Get()->InitializeComponentExtension(); On 2014/07/15 15:13:31, Dmitry Polukhin wrote: > As ...
6 years, 5 months ago (2014-07-15 15:52:32 UTC) #12
Shu Chen
Pinging thakis@, changes in browser_resources.grd and component_loader.cc requires your lgtm. Thanks
6 years, 5 months ago (2014-07-16 01:06:00 UTC) #13
Shu Chen
+xiyuan@ to see whether the cl is safe for Kiosk.
6 years, 5 months ago (2014-07-16 01:25:41 UTC) #14
Dmitry Polukhin
lgtm https://codereview.chromium.org/389913002/diff/140001/chrome/browser/extensions/component_loader.cc File chrome/browser/extensions/component_loader.cc (right): https://codereview.chromium.org/389913002/diff/140001/chrome/browser/extensions/component_loader.cc#newcode432 chrome/browser/extensions/component_loader.cc:432: input_method_manager->InitializeComponentExtension(); FYI, Per comment above if IME component ...
6 years, 5 months ago (2014-07-16 07:11:35 UTC) #15
Shu Chen
https://codereview.chromium.org/389913002/diff/140001/chrome/browser/extensions/component_loader.cc File chrome/browser/extensions/component_loader.cc (right): https://codereview.chromium.org/389913002/diff/140001/chrome/browser/extensions/component_loader.cc#newcode432 chrome/browser/extensions/component_loader.cc:432: input_method_manager->InitializeComponentExtension(); On 2014/07/16 07:11:34, Dmitry Polukhin wrote: > FYI, ...
6 years, 5 months ago (2014-07-16 14:25:41 UTC) #16
xiyuan
On 2014/07/16 01:25:41, Shu Chen wrote: > +xiyuan@ to see whether the cl is safe ...
6 years, 5 months ago (2014-07-16 17:33:46 UTC) #17
Alexander Alekseev
FYI: This CL will likely have a merge conflict with https://codereview.chromium.org/397723002/ .
6 years, 5 months ago (2014-07-22 16:49:09 UTC) #18
Nico
I don't understand the big picture here, I trust that other reviewers looked at this. ...
6 years, 5 months ago (2014-07-22 17:05:08 UTC) #19
Shu Chen
https://codereview.chromium.org/389913002/diff/180001/chrome/browser/chromeos/chrome_browser_main_chromeos.cc File chrome/browser/chromeos/chrome_browser_main_chromeos.cc (right): https://codereview.chromium.org/389913002/diff/180001/chrome/browser/chromeos/chrome_browser_main_chromeos.cc#newcode706 chrome/browser/chromeos/chrome_browser_main_chromeos.cc:706: input_method::Shutdown(); For the naming, all the shutdown methods around ...
6 years, 5 months ago (2014-07-23 00:56:45 UTC) #20
Nico
lgtm https://codereview.chromium.org/389913002/diff/180001/chrome/browser/extensions/component_loader.cc File chrome/browser/extensions/component_loader.cc (right): https://codereview.chromium.org/389913002/diff/180001/chrome/browser/extensions/component_loader.cc#newcode475 chrome/browser/extensions/component_loader.cc:475: chromeos::input_method::InputMethodManager* input_method_manager = On 2014/07/23 00:56:45, Shu Chen ...
6 years, 5 months ago (2014-07-23 01:03:11 UTC) #21
Shu Chen
https://codereview.chromium.org/389913002/diff/200001/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc File chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc (right): https://codereview.chromium.org/389913002/diff/200001/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc#newcode316 chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc:316: if (p != map + map_size && !(*p < ...
6 years, 5 months ago (2014-07-23 03:05:55 UTC) #22
Shu Chen
The CQ bit was checked by shuchen@chromium.org
6 years, 4 months ago (2014-07-28 08:12:11 UTC) #23
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/shuchen@chromium.org/389913002/300001
6 years, 4 months ago (2014-07-28 08:12:35 UTC) #24
Shu Chen
The CQ bit was unchecked by shuchen@chromium.org
6 years, 4 months ago (2014-07-28 08:13:10 UTC) #25
Yuki
On 2014/07/14 10:02:47, nona wrote: > almost lgtm, please address my few comments :) > ...
6 years, 4 months ago (2014-07-28 08:37:55 UTC) #26
Yuki
lgtm on behalf of nona. This is a rubber stamp lgtm.
6 years, 4 months ago (2014-07-28 08:39:03 UTC) #27
Shu Chen
The CQ bit was checked by shuchen@chromium.org
6 years, 4 months ago (2014-07-28 08:40:04 UTC) #28
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/shuchen@chromium.org/389913002/300001
6 years, 4 months ago (2014-07-28 08:40:47 UTC) #29
commit-bot: I haz the power
Change committed as 285905
6 years, 4 months ago (2014-07-28 14:39:47 UTC) #30
mtomasz
6 years, 4 months ago (2014-07-31 02:20:18 UTC) #31
Message was sent while issue was closed.
https://codereview.chromium.org/389913002/diff/300001/chrome/browser/chromeos...
File
chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
(right):

https://codereview.chromium.org/389913002/diff/300001/chrome/browser/chromeos...
chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc:258:
if (!base::PathExists(file_path))
This crashes Debug build, because of thread restrictions.

[4092:4092:0731/103038:FATAL:thread_restrictions.cc(38)] Function marked as
IO-only was called from a thread that disallows IO!  If this thread really
should be allowed to make IO calls, adjust the call to
base::ThreadRestrictions::SetIOAllowed() in this thread's startup.

#0  base::debug::(anonymous namespace)::DebugBreak () at
../../base/debug/debugger_posix.cc:228
#1  0x00000000019a85f9 in base::debug::BreakDebugger () at
../../base/debug/debugger_posix.cc:241
#2  0x0000000001a1f772 in logging::LogMessage::~LogMessage (this=0x7fffffff96c8)
at ../../base/logging.cc:644
#3  0x0000000001ad879f in base::ThreadRestrictions::AssertIOAllowed () at
../../base/threading/thread_restrictions.cc:38
#4  0x00000000019e6c01 in base::PathExists (path=...) at
../../base/file_util_posix.cc:350
#5  0x0000000008a9d854 in chromeos::ComponentExtensionIMEManagerImpl::Load
(this=0x3e841b5cd920, 
    extension_id="fgoepimhcoialccpbmpnnblemnepkkao", 
    manifest="{\n  \"key\":
\"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsVpj8qC5VhObWORqQ3odZm+z5Vf58jWtqG2dmWkG87gsS1ZuYm4jA7mFZItOxgMENpYYWla8HCs21W6hEGoydDiIEAEVaWMTzCw19/x0m/LMeNIBtuaZ/IJQvFJuo1KHvmHX0lWxsHZgUfwp"...,
file_path=...)
    at
../../chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc:258

Powered by Google App Engine
This is Rietveld 408576698