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

Side by Side Diff: chrome/browser/chromeos/preferences.h

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 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
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 #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 #include <vector> 9 #include <vector>
10 10
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 // Updates the initial key repeat delay and key repeat interval following 94 // Updates the initial key repeat delay and key repeat interval following
95 // current prefs values. We set the delay and interval at once since an 95 // current prefs values. We set the delay and interval at once since an
96 // underlying XKB API requires it. 96 // underlying XKB API requires it.
97 void UpdateAutoRepeatRate(); 97 void UpdateAutoRepeatRate();
98 98
99 // Force natural scroll to on if --enable-natural-scroll-default is specified 99 // Force natural scroll to on if --enable-natural-scroll-default is specified
100 // on the cmd line. 100 // on the cmd line.
101 void ForceNaturalScrollDefault(); 101 void ForceNaturalScrollDefault();
102 102
103 // PrefServiceSyncableObserver implementation. 103 // PrefServiceSyncableObserver implementation.
104 virtual void OnIsSyncingChanged() OVERRIDE; 104 virtual void OnIsSyncingChanged() override;
105 105
106 // Overriden from ash::ShellObserver. 106 // Overriden from ash::ShellObserver.
107 virtual void OnTouchHudProjectionToggled(bool enabled) OVERRIDE; 107 virtual void OnTouchHudProjectionToggled(bool enabled) override;
108 108
109 // Overriden form user_manager::UserManager::UserSessionStateObserver. 109 // Overriden form user_manager::UserManager::UserSessionStateObserver.
110 virtual void ActiveUserChanged( 110 virtual void ActiveUserChanged(
111 const user_manager::User* active_user) OVERRIDE; 111 const user_manager::User* active_user) override;
112 112
113 void ActivateInputMethods(const user_manager::User* active_user); 113 void ActivateInputMethods(const user_manager::User* active_user);
114 114
115 PrefServiceSyncable* prefs_; 115 PrefServiceSyncable* prefs_;
116 116
117 input_method::InputMethodManager* input_method_manager_; 117 input_method::InputMethodManager* input_method_manager_;
118 scoped_ptr<TracingManager> tracing_manager_; 118 scoped_ptr<TracingManager> tracing_manager_;
119 119
120 BooleanPrefMember performance_tracing_enabled_; 120 BooleanPrefMember performance_tracing_enabled_;
121 BooleanPrefMember tap_to_click_enabled_; 121 BooleanPrefMember tap_to_click_enabled_;
(...skipping 26 matching lines...) Expand all
148 148
149 // Input Methods state for this user. 149 // Input Methods state for this user.
150 scoped_refptr<input_method::InputMethodManager::State> ime_state_; 150 scoped_refptr<input_method::InputMethodManager::State> ime_state_;
151 151
152 DISALLOW_COPY_AND_ASSIGN(Preferences); 152 DISALLOW_COPY_AND_ASSIGN(Preferences);
153 }; 153 };
154 154
155 } // namespace chromeos 155 } // namespace chromeos
156 156
157 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_ 157 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698