summaryrefslogtreecommitdiffstats
path: root/ash/ime
Commit message (Collapse)AuthorAgeFilesLines
* Move files from ui/views/corewm to ui/wm/coreben@chromium.org2014-03-113-3/+3
| | | | | | | | | | R=sky@chromium.org TBR=sky@chromium.org http://crbug.com/308710 Review URL: https://codereview.chromium.org/194843004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256329 0039d316-1c4b-4281-b951-d872f2087c98
* try 3 of: Split out InputMethodMenuManager from InputMethodManager.uekawa@chromium.org2014-02-196-0/+328
| | | | | | | | | | | | | | (I was missing RemoveObserver in one of the tests and as a result ASAN tests were catching use-after-free.) Rename input_method_property to input_method_menu_item, and move to ash/ime. BUG=342336, 343044 Review URL: https://codereview.chromium.org/169033003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251996 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 251327 "Reland of: Split out InputMethodMenuManager from ..."thestig@chromium.org2014-02-146-328/+0
| | | | | | | | | | | | | | | | | | | | > Reland of: Split out InputMethodMenuManager from InputMethodManager. > > Rename input_method_property to input_method_menu_item, and move to ash/ime. > > This is a reland of https://codereview.chromium.org/150203015,reverted by https://codereview.chromium.org/165453002 > > Use Singleton<> instead of trying to maintain my own singleton. > > BUG=342336, 343044 > > Review URL: https://codereview.chromium.org/165783002 TBR=uekawa@chromium.org Review URL: https://codereview.chromium.org/167823002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251436 0039d316-1c4b-4281-b951-d872f2087c98
* Reland of: Split out InputMethodMenuManager from InputMethodManager.uekawa@chromium.org2014-02-146-0/+328
| | | | | | | | | | | | | | Rename input_method_property to input_method_menu_item, and move to ash/ime. This is a reland of https://codereview.chromium.org/150203015,reverted by https://codereview.chromium.org/165453002 Use Singleton<> instead of trying to maintain my own singleton. BUG=342336, 343044 Review URL: https://codereview.chromium.org/165783002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251327 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 251164 "Split out InputMethodMenuManager from InputMethod..."sky@chromium.org2014-02-146-360/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > Split out InputMethodMenuManager from InputMethodManager. > > Rename input_method_property to input_method_menu_item, and move to ash/ime. > > BUG=342336, 343044 > > Review URL: https://codereview.chromium.org/150203015 I'm reverting as test appears to be consistently failing: http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29/builds/39558/steps/ash_unittests/logs/TestUninitializedGet InputMethodMenuManagerTest.TestUninitializedGet (run #1): [ RUN ] InputMethodMenuManagerTest.TestUninitializedGet [WARNING] ../../testing/gtest/src/gtest-death-test.cc:825:: Death tests use fork(), which is unsafe particularly in a threaded context. For this test, Google Test couldn't detect the number of threads. ../../ash/ime/input_method_menu_manager_unittest.cc:16: Failure Death test: InputMethodMenuManager::Get() Result: failed to die. Error msg: [ DEATH ] [ FAILED ] InputMethodMenuManagerTest.TestUninitializedGet (4 ms) InputMethodMenuManagerTest.TestUninitializedGet (run #2): [ RUN ] InputMethodMenuManagerTest.TestUninitializedGet [WARNING] ../../testing/gtest/src/gtest-death-test.cc:825:: Death tests use fork(), which is unsafe particularly in a threaded context. For this test, Google Test couldn't detect the number of threads. ../../ash/ime/input_method_menu_manager_unittest.cc:16: Failure Death test: InputMethodMenuManager::Get() Result: failed to die. Error msg: [ DEATH ] [ FAILED ] InputMethodMenuManagerTest.TestUninitializedGet (2 ms) InputMethodMenuManagerTest.TestUninitializedGet (run #3): [ RUN ] InputMethodMenuManagerTest.TestUninitializedGet [WARNING] ../../testing/gtest/src/gtest-death-test.cc:825:: Death tests use fork(), which is unsafe particularly in a threaded context. For this test, Google Test couldn't detect the number of threads. ../../ash/ime/input_method_menu_manager_unittest.cc:16: Failure Death test: InputMethodMenuManager::Get() Result: failed to die. Error msg: [ DEATH ] [ FAILED ] InputMethodMenuManagerTest.TestUninitializedGet (2 ms) InputMethodMenuManagerTest.TestUninitializedGet (run #4): [ RUN ] InputMethodMenuManagerTest.TestUninitializedGet [WARNING] ../../testing/gtest/src/gtest-death-test.cc:825:: Death tests use fork(), which is unsafe particularly in a threaded context. For this test, Google Test couldn't detect the number of threads. ../../ash/ime/input_method_menu_manager_unittest.cc:16: Failure Death test: InputMethodMenuManager::Get() Result: failed to die. Error msg: [ DEATH ] [ FAILED ] InputMethodMenuManagerTest.TestUninitializedGet (1 ms) TBR=uekawa@chromium.org Review URL: https://codereview.chromium.org/165453002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251194 0039d316-1c4b-4281-b951-d872f2087c98
* Split out InputMethodMenuManager from InputMethodManager.uekawa@chromium.org2014-02-136-0/+360
| | | | | | | | | | Rename input_method_property to input_method_menu_item, and move to ash/ime. BUG=342336, 343044 Review URL: https://codereview.chromium.org/150203015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251164 0039d316-1c4b-4281-b951-d872f2087c98
* Migrate CandidateWindow::Entry to string16.uekawa@chromium.org2014-02-134-46/+51
| | | | | | | | BUG=329604 Review URL: https://codereview.chromium.org/162723003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251032 0039d316-1c4b-4281-b951-d872f2087c98
* Let ModeIndicator ignore the shelf-space.mukai@chromium.org2014-02-112-0/+34
| | | | | | | | | | BUG=340348 R=nona@chromium.org TEST=manually Review URL: https://codereview.chromium.org/143073010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250538 0039d316-1c4b-4281-b951-d872f2087c98
* Clean-up: Replaces obsolete Font/FontList methods.yukishiino@chromium.org2014-02-051-7/+4
| | | | | | | | | | | Replaces obsolete methods of gfx::Font and gfx::FontList with new ones. BUG=265485 TEST=none Review URL: https://codereview.chromium.org/140693017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248926 0039d316-1c4b-4281-b951-d872f2087c98
* Renames gfx::FontList::Derive* family.yukishiino@chromium.org2014-01-312-18/+14
| | | | | | | | | | | | | | | | | | | 1. Removes obsolete methods. - DeriveFontList(font_style) # The method name and argument are not clear compared to other versions. Use DeriveWithStyle(style) below instead. - DeriveFontListWithSize(absolute_size) # Don't specify the absolute size. 2. Renames very long named methods. - DeriveFontListWithSizeDeltaAndStyle => Derive - DeriveFontListWithSizeDelta => DeriveWithSizeDelta - new method => DeriveWithStyle Since DeriveFontListWithSizeDeltaAndStyle is used more often than DeriveFontListWithSizeDelta, so give the former a shorter name. Review URL: https://codereview.chromium.org/142523003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248131 0039d316-1c4b-4281-b951-d872f2087c98
* views: Make View::set_border() take a scoped_ptr<>.erg@chromium.org2014-01-243-29/+33
| | | | | | | | | | | This makes the ownership situation much clearer. It also renames the function to SetBorder() (since it is not a simple accessor and can free previous instances of Border), and creates a Border::NullBorder() method (since "SetBorder(scoped_ptr<>())" is not clear). BUG=none R=sky@chromium.org Review URL: https://codereview.chromium.org/145033006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246990 0039d316-1c4b-4281-b951-d872f2087c98
* Moves IME's views specific code out from chrome/browser/chromeos.mukai@chromium.org2014-01-1511-0/+1795
| | | | | | | | | | | | | | | | | | Now UI code of input methods -- candidate window, infolist window, and mode indicator -- is pure views and doesn't need to be in c/b. I chose ash/ime because they are ash-specific UI, but I'm okay to move to another place. Please tell me if you have other ideas. BUG=325813 R=oshima@chromium.org, komatsu@chromium.org TEST=no functional changes, compile succeeds Review URL: https://codereview.chromium.org/132083009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244895 0039d316-1c4b-4281-b951-d872f2087c98
* aura/ash split: Moves RootWindowEventFilter and InputMethodEventFilter to ↵erg@google.com2012-05-153-230/+0
| | | | | | | | | | | | | | | | | | | ui/aura/. All of InputMethodEventFilter and more than half of RootWindowEventFilter were copied verbatim to a DesktopRootWindowEventFilter. Instead of copying the other half for another patch, I'm just moving RWEF and deleting the desktop version. (InputMethodEventFilterUnittest was simple enough to move with the file, but RootWindowEventFilter seems to act more like an integraiton test of a lot of the stuff on Shell.) BUG=125106 Review URL: https://chromiumcodereview.appspot.com/10332145 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137175 0039d316-1c4b-4281-b951-d872f2087c98
* Ash/aura split: Get views_examples_exe semi-running on linux/X11.erg@chromium.org2012-03-303-73/+4
| | | | | | | | | | | This adds tons of hacks, most of which should be clearly labeled with TODOs. BUG=119759 TEST= Review URL: http://codereview.chromium.org/9873035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129990 0039d316-1c4b-4281-b951-d872f2087c98
* Fix typos in #include guards.yusukes@chromium.org2012-03-192-7/+7
| | | | | | | | | | BUG=None TEST=try Review URL: http://codereview.chromium.org/9716014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127432 0039d316-1c4b-4281-b951-d872f2087c98
* Convert a bunch of AuraTestBase users to AshTestBase.ben@chromium.org2012-02-291-13/+2
| | | | | | | | http://crbug.com/112131 TEST=none Review URL: https://chromiumcodereview.appspot.com/9522012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124220 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Start moving window_util.h functions into wm namespace.tfarina@chromium.org2012-02-271-1/+1
| | | | | | | | | BUG=115846 R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9455085 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123730 0039d316-1c4b-4281-b951-d872f2087c98
* Change EventGenerator to take a RootWindow at construction instead of just ↵ben@chromium.org2012-02-211-3/+3
| | | | | | | | | | | assuming one via RootWindow::GetInstance(). http://crbug.com/112131 TEST=none Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=122716 Review URL: https://chromiumcodereview.appspot.com/9421016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122829 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r122716 and r122717maruel@chromium.org2012-02-191-3/+3
| | | | | | | | | | | | | | | | r122716 "Change EventGenerator to take a RootWindow at construction instead of just assuming one via RootWindow::GetInstance()." r122717 "Fix build bustage. These two files were left out of my last CL due to permission issues." Broke compile on Win. Current Mac compile failure is older and will be fixed in a follow up CL. TBR=ben@chromium.org BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/9424026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122721 0039d316-1c4b-4281-b951-d872f2087c98
* Change EventGenerator to take a RootWindow at construction instead of just ↵ben@chromium.org2012-02-191-3/+3
| | | | | | | | | | assuming one via RootWindow::GetInstance(). http://crbug.com/112131 TEST=none Review URL: https://chromiumcodereview.appspot.com/9421016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122716 0039d316-1c4b-4281-b951-d872f2087c98
* A bevy of Aura test changes:ben@chromium.org2012-02-171-3/+3
| | | | | | | | | | | | - renames aura_shell_test_base to ash_test_base - AshTestBase no longer subclasses AuraTestBase, instead now it and AuraTestBase both own a helper that does common initialization. This is necessary because in subsequent changes ash::Shell will be responsible for creating and owning its own RootWindow, whereas Aura code could have N RootWindows. - Makes ScreenAura take a RootWindow instead of using RootWindow::GetInstance() http://crbug.com/112131 TEST=none Review URL: https://chromiumcodereview.appspot.com/9425015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122597 0039d316-1c4b-4281-b951-d872f2087c98
* Provide a RootWindow instance getter on the shell, in preparation for ↵ben@chromium.org2012-02-172-5/+5
| | | | | | | | | | removing RootWindow::GetInstance(). http://crbug.com/112131 TEST=compiles Review URL: https://chromiumcodereview.appspot.com/9395038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122561 0039d316-1c4b-4281-b951-d872f2087c98
* aura::Window only supports void* and int values for custom properties, which ↵benrg@chromium.org2012-02-112-3/+5
| | | | | | | | | | | | must be cast to and from the correct type at each use point. This CL introduces typed properties and templated aura::Window::[GS]etProperty methods that enforce the use of the declared type. Only pointer types and integral types that fits in intptr_t are supported, and ownership behavior is the same as before. This CL also adds support for default property values other than NULL/0. BUG=none TEST=updated unit tests Review URL: http://codereview.chromium.org/8533025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121583 0039d316-1c4b-4281-b951-d872f2087c98
* * Widget with WIDGET_OWNS_NATIVE_WIDGET has to be deleted explicitly.oshima@chromium.org2012-02-071-7/+11
| | | | | | | | | | | | * Delegate needs to be deleted but window has to be deleted prior to it. * a few minor leak fixes. BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/9350013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120856 0039d316-1c4b-4281-b951-d872f2087c98
* Remove Owner param to EventFilter's ctor.ben@chromium.org2012-01-312-3/+2
| | | | | | | | BUG=none TEST=existing unittests Review URL: https://chromiumcodereview.appspot.com/9315004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119954 0039d316-1c4b-4281-b951-d872f2087c98
* aura: Gesture event plumbing (skeleton).sadrul@chromium.org2012-01-172-2/+11
| | | | | | | | | | | | | Add gesture event plumbing through aura. This is not functional just yet. Subsequent CLs will move the gesture-recognizer from views into aura, which will then generate and deliver aura gesture events. BUG=11024 TEST=no functional changes yet. Tests will be added when GR is moved into aura. Review URL: https://chromiumcodereview.appspot.com/9221014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117911 0039d316-1c4b-4281-b951-d872f2087c98
* IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod ↵yusukes@chromium.org2011-12-265-0/+296
in ash. Part 1: http://codereview.chromium.org/8659033/ Part 2: http://codereview.chromium.org/8687027/ The basic design of the feature is that to use an input method as an event filter for a KeyEvent, and to feed all KeyPress and KeyRelease events that are passed to the filter to the input method. The input method sends IME results (e.g. composition text) to RenderWidgetHostViewAura or NativeWidgetAura as needed. RenderWidgetHostViewAura: - Just like RWHVV, implements ui::TextInputClient interface so that RWHVA could receive an event such as 'SetComposition' and 'InsertChar' from an input method object owned by InputMethodEventFilter. - Sends a notification to the input method object on focus, blur, text input type change, etc. - OnKeyEvent() handler is now able to handle a non-native key event, e.g. a VKEY_PROCESSKEY event, which is fabricated by the input method editor. NativeWidgetAura: - Uses views::InputMethodBridge instead of views::InputMethodIBus. - InputMethodBridge, which implements ui::TextInputClient interface, just receives IME results (e.g. composition text) from ui::InputMethod and forwards them to Views UI (e.g. a text field). - InputMethodBridge also receives a request like 'CancelComposition' from the UI and forwards the request to ui::InputMethod. InputMethodEventFilter: - Creates and owns a ui::InputMethodIBus object. If IBus-1.4 is not available (e.g. Windows and Goobuntu), creates an instance of ui::MockInputMethod instead. - In PreHandleKeyEvent(), sends a KeyPress and KeyRelease event to the input method. - Implements ui::InputMethodDelegate interface so that InputMethodEventFilter could receive a translated key press and key release event (i.e. a key event translated by the IME) which has to be sent back to the root window. Note that the translated key event might be pre-handled by a global short-cut key event filter, otherwise is sent to NWA or RWHVA from the root window. Also note that a Char event is always sent directly from the input method to a TextInputClient. The ui::InputMethodDelegate is not used for that purpose. Supported platforms: - Aura + Chrome OS (IME works!) - Aura + Chrome OS + TOUCH_UI (compiles, but virtual keyboard is not shown since views::TextInputTypeTracker is not ported to Aura yet.) - Aura + Linux, with and without IBus-1.4 - Aura + Windows (compiles, but IME does not work. views::InputMethodWin is not ported to Aura yet.) BUG=97261 TEST=ran input_method_event_filter_unittests.cc Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=113224 Review URL: http://codereview.chromium.org/8576005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115778 0039d316-1c4b-4281-b951-d872f2087c98