chrome/browser/chromeos/input_method/input_method_configuration.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: chrome/browser/chromeos/input_method/input_method_configuration.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 (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 "chrome/browser/chromeos/input_method/input_method_configuration.h"	5 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

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

9 #include "base/logging.h"	8 #include "base/logging.h"

10 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

11 #include "chrome/browser/chromeos/input_method/browser_state_monitor.h"	10 #include "chrome/browser/chromeos/input_method/browser_state_monitor.h"

12 #include "chrome/browser/chromeos/input_method/input_method_delegate_impl.h"	11 #include "chrome/browser/chromeos/input_method/input_method_delegate_impl.h"

13 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"	12 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"

14 #include "chrome/browser/chromeos/input_method/input_method_persistence.h"	13 #include "chrome/browser/chromeos/input_method/input_method_persistence.h"

15 #include "chromeos/ime/ibus_bridge.h"	14 #include "chromeos/ime/ibus_bridge.h"

16	15

17 namespace chromeos {	16 namespace chromeos {

18 namespace input_method {	17 namespace input_method {

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
66	65

67 DVLOG(1) << "InputMethodManager shutdown";	66 DVLOG(1) << "InputMethodManager shutdown";

68 }	67 }

69	68

70 InputMethodManager* GetInputMethodManager() {	69 InputMethodManager* GetInputMethodManager() {

71 return InputMethodManager::Get();	70 return InputMethodManager::Get();

72 }	71 }

73	72

74 } // namespace input_method	73 } // namespace input_method

75 } // namespace chromeos	74 } // namespace chromeos

OLD	NEW