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

Unified Diff: ui/base/ime/input_method_factory.cc

Issue 851853002: It is time. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Trying to reup because the last upload failed. Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/ime/input_method_factory.h ('k') | ui/base/ime/input_method_initializer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/input_method_factory.cc
diff --git a/ui/base/ime/input_method_factory.cc b/ui/base/ime/input_method_factory.cc
deleted file mode 100644
index e1ad03d35fdd3da473caa50050530f628104dd0d..0000000000000000000000000000000000000000
--- a/ui/base/ime/input_method_factory.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/base/ime/input_method_factory.h"
-
-#include "ui/base/ime/mock_input_method.h"
-
-#if defined(OS_CHROMEOS)
-#include "ui/base/ime/input_method_chromeos.h"
-#elif defined(OS_WIN)
-#include "base/win/metro.h"
-#include "ui/base/ime/input_method_win.h"
-#include "ui/base/ime/remote_input_method_win.h"
-#elif defined(OS_MACOSX)
-#include "ui/base/ime/input_method_mac.h"
-#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-#include "ui/base/ime/input_method_auralinux.h"
-#else
-#include "ui/base/ime/input_method_minimal.h"
-#endif
-
-namespace {
-
-bool g_input_method_set_for_testing = false;
-
-bool g_create_input_method_called = false;
-
-} // namespace
-
-namespace ui {
-
-scoped_ptr<InputMethod> CreateInputMethod(
- internal::InputMethodDelegate* delegate,
- gfx::AcceleratedWidget widget) {
- if (!g_create_input_method_called)
- g_create_input_method_called = true;
-
- if (g_input_method_set_for_testing)
- return scoped_ptr<InputMethod>(new MockInputMethod(delegate));
-
-#if defined(OS_CHROMEOS)
- return scoped_ptr<InputMethod>(new InputMethodChromeOS(delegate));
-#elif defined(OS_WIN)
- if (IsRemoteInputMethodWinRequired(widget))
- return CreateRemoteInputMethodWin(delegate);
- return scoped_ptr<InputMethod>(new InputMethodWin(delegate, widget));
-#elif defined(OS_MACOSX)
- return scoped_ptr<InputMethod>(new InputMethodMac(delegate));
-#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
- return scoped_ptr<InputMethod>(new InputMethodAuraLinux(delegate));
-#else
- return scoped_ptr<InputMethod>(new InputMethodMinimal(delegate));
-#endif
-}
-
-void SetUpInputMethodFactoryForTesting() {
- if (g_input_method_set_for_testing)
- return;
-
- CHECK(!g_create_input_method_called)
- << "ui::SetUpInputMethodFactoryForTesting was called after use of "
- << "ui::CreateInputMethod. You must call "
- << "ui::SetUpInputMethodFactoryForTesting earlier.";
-
- g_input_method_set_for_testing = true;
-}
-
-} // namespace ui
« no previous file with comments | « ui/base/ime/input_method_factory.h ('k') | ui/base/ime/input_method_initializer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698