ui/base/ime/input_method_initializer.cc - Issue 23904025: Move IsRunningOnChromeOS to SysInfo

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 23904025: Move IsRunningOnChromeOS to SysInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge fix Created 7 years, 2 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

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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_initializer.h"	5 #include "ui/base/ime/input_method_initializer.h"

6	6

7 #include "ui/base/ime/input_method_factory.h"	7 #include "ui/base/ime/input_method_factory.h"

8	8

9 #if defined(OS_CHROMEOS)	9 #if defined(OS_CHROMEOS)

10 #include "base/chromeos/chromeos_version.h"

11 #include "base/logging.h"	10 #include "base/logging.h"

12 #include "chromeos/dbus/dbus_thread_manager.h"	11 #include "chromeos/dbus/dbus_thread_manager.h"

13 #include "chromeos/ime/ibus_bridge.h"	12 #include "chromeos/ime/ibus_bridge.h"

14 #elif defined(OS_WIN)	13 #elif defined(OS_WIN)

15 #include "base/win/metro.h"	14 #include "base/win/metro.h"

16 #include "ui/base/ime/win/tsf_bridge.h"	15 #include "ui/base/ime/win/tsf_bridge.h"

17 #endif	16 #endif

18	17

19 #if defined(OS_CHROMEOS)	18 #if defined(OS_CHROMEOS)

20 namespace {	19 namespace {

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
71 #elif defined(OS_WIN)	70 #elif defined(OS_WIN)

72 ui::internal::DestroySharedInputMethod();	71 ui::internal::DestroySharedInputMethod();

73 if (base::win::IsTSFAwareRequired()) {	72 if (base::win::IsTSFAwareRequired()) {

74 ui::TSFBridge::Shutdown();	73 ui::TSFBridge::Shutdown();

75 CoUninitialize();	74 CoUninitialize();

76 }	75 }

77 #endif	76 #endif

78 }	77 }

79	78

80 } // namespace ui	79 } // namespace ui

OLD	NEW

« no previous file with comments | « ui/base/ime/input_method_ibus.cc ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »