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

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

Issue 1581473002: Remove base/win/metro.{cc|h} and some associated code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 4 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 unified diff | Download patch
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 "build/build_config.h" 7 #include "build/build_config.h"
8 #include "ui/base/ime/mock_input_method.h" 8 #include "ui/base/ime/mock_input_method.h"
9 9
10 #if defined(OS_CHROMEOS) 10 #if defined(OS_CHROMEOS)
11 #include "ui/base/ime/input_method_chromeos.h" 11 #include "ui/base/ime/input_method_chromeos.h"
12 #elif defined(OS_WIN) 12 #elif defined(OS_WIN)
13 #include "base/win/metro.h"
14 #include "ui/base/ime/input_method_win.h" 13 #include "ui/base/ime/input_method_win.h"
15 #include "ui/base/ime/remote_input_method_win.h" 14 #include "ui/base/ime/remote_input_method_win.h"
16 #elif defined(OS_MACOSX) 15 #elif defined(OS_MACOSX)
17 #include "ui/base/ime/input_method_mac.h" 16 #include "ui/base/ime/input_method_mac.h"
18 #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \ 17 #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \
19 !defined(OS_CHROMEOS) 18 !defined(OS_CHROMEOS)
20 #include "ui/base/ime/input_method_auralinux.h" 19 #include "ui/base/ime/input_method_auralinux.h"
21 #elif defined(OS_ANDROID) 20 #elif defined(OS_ANDROID)
22 #include "ui/base/ime/input_method_android.h" 21 #include "ui/base/ime/input_method_android.h"
23 #else 22 #else
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 << "ui::SetUpInputMethodFactoryForTesting earlier."; 78 << "ui::SetUpInputMethodFactoryForTesting earlier.";
80 79
81 g_input_method_set_for_testing = true; 80 g_input_method_set_for_testing = true;
82 } 81 }
83 82
84 void SetUpInputMethodForTesting(InputMethod* input_method) { 83 void SetUpInputMethodForTesting(InputMethod* input_method) {
85 g_input_method_for_testing = input_method; 84 g_input_method_for_testing = input_method;
86 } 85 }
87 86
88 } // namespace ui 87 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698