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

Side by Side Diff: ui/base/ime/input_method_factory.cc

Issue 312523003: MacViews: Implement a ui::InputMethod for Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/ime/input_method_factory.h" 5 #include "ui/base/ime/input_method_factory.h"
6 6
7 #include "ui/base/ime/mock_input_method.h" 7 #include "ui/base/ime/mock_input_method.h"
8 8
9 #if defined(OS_CHROMEOS) && defined(USE_X11) 9 #if defined(OS_CHROMEOS) && defined(USE_X11)
10 #include "ui/base/ime/input_method_chromeos.h" 10 #include "ui/base/ime/input_method_chromeos.h"
11 #elif defined(OS_WIN) 11 #elif defined(OS_WIN)
12 #include "base/win/metro.h" 12 #include "base/win/metro.h"
13 #include "ui/base/ime/input_method_win.h" 13 #include "ui/base/ime/input_method_win.h"
14 #include "ui/base/ime/remote_input_method_win.h" 14 #include "ui/base/ime/remote_input_method_win.h"
15 #elif defined(OS_MACOSX)
16 #include "ui/base/ime/input_method_mac.h"
15 #elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) 17 #elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
16 #include "ui/base/ime/input_method_auralinux.h" 18 #include "ui/base/ime/input_method_auralinux.h"
17 #else 19 #else
18 #include "ui/base/ime/input_method_minimal.h" 20 #include "ui/base/ime/input_method_minimal.h"
19 #endif 21 #endif
20 22
21 namespace { 23 namespace {
22 24
23 bool g_input_method_set_for_testing = false; 25 bool g_input_method_set_for_testing = false;
24 26
(...skipping 11 matching lines...) Expand all
36 38
37 if (g_input_method_set_for_testing) 39 if (g_input_method_set_for_testing)
38 return scoped_ptr<InputMethod>(new MockInputMethod(delegate)); 40 return scoped_ptr<InputMethod>(new MockInputMethod(delegate));
39 41
40 #if defined(OS_CHROMEOS) && defined(USE_X11) 42 #if defined(OS_CHROMEOS) && defined(USE_X11)
41 return scoped_ptr<InputMethod>(new InputMethodChromeOS(delegate)); 43 return scoped_ptr<InputMethod>(new InputMethodChromeOS(delegate));
42 #elif defined(OS_WIN) 44 #elif defined(OS_WIN)
43 if (IsRemoteInputMethodWinRequired(widget)) 45 if (IsRemoteInputMethodWinRequired(widget))
44 return CreateRemoteInputMethodWin(delegate); 46 return CreateRemoteInputMethodWin(delegate);
45 return scoped_ptr<InputMethod>(new InputMethodWin(delegate, widget)); 47 return scoped_ptr<InputMethod>(new InputMethodWin(delegate, widget));
48 #elif defined(OS_MACOSX)
49 return scoped_ptr<InputMethod>(new InputMethodMac(delegate));
46 #elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) 50 #elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
47 return scoped_ptr<InputMethod>(new InputMethodAuraLinux(delegate)); 51 return scoped_ptr<InputMethod>(new InputMethodAuraLinux(delegate));
48 #else 52 #else
49 return scoped_ptr<InputMethod>(new InputMethodMinimal(delegate)); 53 return scoped_ptr<InputMethod>(new InputMethodMinimal(delegate));
50 #endif 54 #endif
51 } 55 }
52 56
53 void SetUpInputMethodFactoryForTesting() { 57 void SetUpInputMethodFactoryForTesting() {
54 if (g_input_method_set_for_testing) 58 if (g_input_method_set_for_testing)
55 return; 59 return;
56 60
57 CHECK(!g_create_input_method_called) 61 CHECK(!g_create_input_method_called)
58 << "ui::SetUpInputMethodFactoryForTesting was called after use of " 62 << "ui::SetUpInputMethodFactoryForTesting was called after use of "
59 << "ui::CreateInputMethod. You must call " 63 << "ui::CreateInputMethod. You must call "
60 << "ui::SetUpInputMethodFactoryForTesting earlier."; 64 << "ui::SetUpInputMethodFactoryForTesting earlier.";
61 65
62 g_input_method_set_for_testing = true; 66 g_input_method_set_for_testing = true;
63 } 67 }
64 68
65 } // namespace ui 69 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698