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

Side by Side Diff: chrome/browser/ui/webui/options2/chromeos/pointer_handler.h

Issue 10698140: Remove "2" suffixes from options2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 8 years, 5 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
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_UI_WEBUI_OPTIONS2_CHROMEOS_POINTER_HANDLER2_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_POINTER_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_POINTER_HANDLER2_H_ 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_POINTER_HANDLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "chrome/browser/prefs/pref_member.h" 11 #include "chrome/browser/prefs/pref_member.h"
12 #include "chrome/browser/ui/webui/options2/options_ui2.h" 12 #include "chrome/browser/ui/webui/options2/options_ui.h"
13 #include "chrome/browser/chromeos/system/pointer_device_observer.h" 13 #include "chrome/browser/chromeos/system/pointer_device_observer.h"
14 14
15 namespace chromeos { 15 namespace chromeos {
16 namespace options2 { 16 namespace options2 {
17 17
18 // Pointer settings overlay page UI handler. 18 // Pointer settings overlay page UI handler.
19 class PointerHandler 19 class PointerHandler
20 : public ::options2::OptionsPageUIHandler, 20 : public ::options2::OptionsPageUIHandler,
21 public chromeos::system::PointerDeviceObserver::Observer { 21 public chromeos::system::PointerDeviceObserver::Observer {
22 public: 22 public:
(...skipping 14 matching lines...) Expand all
37 37
38 bool has_touchpad_; 38 bool has_touchpad_;
39 bool has_mouse_; 39 bool has_mouse_;
40 40
41 DISALLOW_COPY_AND_ASSIGN(PointerHandler); 41 DISALLOW_COPY_AND_ASSIGN(PointerHandler);
42 }; 42 };
43 43
44 } // namespace options2 44 } // namespace options2
45 } // namespace chromeos 45 } // namespace chromeos
46 46
47 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_POINTER_HANDLER2_H_ 47 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_POINTER_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698