chrome/browser/chromeos/preferences.h - Issue 9857017: Revert 128889 - Update IME preferences outside the IME status button when Uber Tray is in use.

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/preferences.h

Issue 9857017: Revert 128889 - Update IME preferences outside the IME status button when Uber Tray is in use. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 9 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

« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_manager.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

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 #ifndef CHROME_BROWSER_CHROMEOS_PREFERENCES_H_	5 #ifndef CHROME_BROWSER_CHROMEOS_PREFERENCES_H_

6 #define CHROME_BROWSER_CHROMEOS_PREFERENCES_H_	6 #define CHROME_BROWSER_CHROMEOS_PREFERENCES_H_

7 #pragma once	7 #pragma once

8	8

9 #include <string>	9 #include <string>

10 #include <vector>	10 #include <vector>

(...skipping 86 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
97 BooleanPrefMember use_24hour_clock_;	97 BooleanPrefMember use_24hour_clock_;

98 BooleanPrefMember disable_gdata_;	98 BooleanPrefMember disable_gdata_;

99 BooleanPrefMember disable_gdata_over_cellular_;	99 BooleanPrefMember disable_gdata_over_cellular_;

100 BooleanPrefMember disable_gdata_hosted_files_;	100 BooleanPrefMember disable_gdata_hosted_files_;

101	101

102 // Input method preferences.	102 // Input method preferences.

103 StringPrefMember hotkey_next_engine_in_menu_;	103 StringPrefMember hotkey_next_engine_in_menu_;

104 StringPrefMember hotkey_previous_engine_;	104 StringPrefMember hotkey_previous_engine_;

105 StringPrefMember preferred_languages_;	105 StringPrefMember preferred_languages_;

106 StringPrefMember preload_engines_;	106 StringPrefMember preload_engines_;

107 StringPrefMember current_input_method_;

108 StringPrefMember previous_input_method_;

109	107

110 BooleanPrefMember chewing_boolean_prefs_[	108 BooleanPrefMember chewing_boolean_prefs_[

111 language_prefs::kNumChewingBooleanPrefs];	109 language_prefs::kNumChewingBooleanPrefs];

112 StringPrefMember chewing_multiple_choice_prefs_[	110 StringPrefMember chewing_multiple_choice_prefs_[

113 language_prefs::kNumChewingMultipleChoicePrefs];	111 language_prefs::kNumChewingMultipleChoicePrefs];

114 IntegerPrefMember chewing_hsu_sel_key_type_;	112 IntegerPrefMember chewing_hsu_sel_key_type_;

115 IntegerPrefMember chewing_integer_prefs_[	113 IntegerPrefMember chewing_integer_prefs_[

116 language_prefs::kNumChewingIntegerPrefs];	114 language_prefs::kNumChewingIntegerPrefs];

117 StringPrefMember hangul_keyboard_;	115 StringPrefMember hangul_keyboard_;

118 StringPrefMember hangul_hanja_binding_keys_;	116 StringPrefMember hangul_hanja_binding_keys_;

(...skipping 17 matching lines...) Expand all Loading...
136 IntegerPrefMember xkb_auto_repeat_interval_pref_;	134 IntegerPrefMember xkb_auto_repeat_interval_pref_;

137	135

138 BooleanPrefMember enable_screen_lock_;	136 BooleanPrefMember enable_screen_lock_;

139	137

140 DISALLOW_COPY_AND_ASSIGN(Preferences);	138 DISALLOW_COPY_AND_ASSIGN(Preferences);

141 };	139 };

142	140

143 } // namespace chromeos	141 } // namespace chromeos

144	142

145 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_	143 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_

OLD	NEW