chrome/browser/chromeos/preferences.h - Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2

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 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)

Patch Set: Created 3 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

« no previous file with comments | « chrome/browser/chromeos/power/login_lock_state_notifier.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	7

8 #include <string>	8 #include <string>

9	9

10 #include "ash/common/shell_observer.h"	10 #include "ash/shell_observer.h"

11 #include "base/compiler_specific.h"	11 #include "base/compiler_specific.h"

12 #include "base/macros.h"	12 #include "base/macros.h"

13 #include "chrome/browser/chromeos/language_preferences.h"	13 #include "chrome/browser/chromeos/language_preferences.h"

14 #include "components/prefs/pref_change_registrar.h"	14 #include "components/prefs/pref_change_registrar.h"

15 #include "components/prefs/pref_member.h"	15 #include "components/prefs/pref_member.h"

16 #include "components/sync_preferences/pref_service_syncable_observer.h"	16 #include "components/sync_preferences/pref_service_syncable_observer.h"

17 #include "components/user_manager/user_manager.h"	17 #include "components/user_manager/user_manager.h"

18 #include "ui/base/ime/chromeos/input_method_manager.h"	18 #include "ui/base/ime/chromeos/input_method_manager.h"

19	19

20 class PrefRegistrySimple;	20 class PrefRegistrySimple;

(...skipping 137 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
158 scoped_refptr<input_method::InputMethodManager::State> ime_state_;	158 scoped_refptr<input_method::InputMethodManager::State> ime_state_;

159	159

160 std::unique_ptr<input_method::InputMethodSyncer> input_method_syncer_;	160 std::unique_ptr<input_method::InputMethodSyncer> input_method_syncer_;

161	161

162 DISALLOW_COPY_AND_ASSIGN(Preferences);	162 DISALLOW_COPY_AND_ASSIGN(Preferences);

163 };	163 };

164	164

165 } // namespace chromeos	165 } // namespace chromeos

166	166

167 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_	167 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_

OLD	NEW