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

Side by Side Diff: chrome/browser/chromeos/login/screens/controller_pairing_screen.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 9
10 #include "chrome/browser/chromeos/login/screens/controller_pairing_screen_actor. h" 10 #include "chrome/browser/chromeos/login/screens/controller_pairing_screen_actor. h"
(...skipping 14 matching lines...) Expand all
25 pairing_chromeos::ControllerPairingController* controller); 25 pairing_chromeos::ControllerPairingController* controller);
26 virtual ~ControllerPairingScreen(); 26 virtual ~ControllerPairingScreen();
27 27
28 private: 28 private:
29 typedef pairing_chromeos::ControllerPairingController::Stage Stage; 29 typedef pairing_chromeos::ControllerPairingController::Stage Stage;
30 30
31 void CommitContextChanges(); 31 void CommitContextChanges();
32 bool ExpectStageIs(Stage stage) const; 32 bool ExpectStageIs(Stage stage) const;
33 33
34 // Overridden from WizardScreen: 34 // Overridden from WizardScreen:
35 virtual void PrepareToShow() OVERRIDE; 35 virtual void PrepareToShow() override;
36 virtual void Show() OVERRIDE; 36 virtual void Show() override;
37 virtual void Hide() OVERRIDE; 37 virtual void Hide() override;
38 virtual std::string GetName() const OVERRIDE; 38 virtual std::string GetName() const override;
39 39
40 // Overridden from pairing_chromeos::ControllerPairingController::Observer: 40 // Overridden from pairing_chromeos::ControllerPairingController::Observer:
41 virtual void PairingStageChanged(Stage new_stage) OVERRIDE; 41 virtual void PairingStageChanged(Stage new_stage) override;
42 virtual void DiscoveredDevicesListChanged() OVERRIDE; 42 virtual void DiscoveredDevicesListChanged() override;
43 43
44 // Overridden from ControllerPairingView::Delegate: 44 // Overridden from ControllerPairingView::Delegate:
45 virtual void OnActorDestroyed(ControllerPairingScreenActor* actor) OVERRIDE; 45 virtual void OnActorDestroyed(ControllerPairingScreenActor* actor) override;
46 virtual void OnScreenContextChanged( 46 virtual void OnScreenContextChanged(
47 const base::DictionaryValue& diff) OVERRIDE; 47 const base::DictionaryValue& diff) override;
48 virtual void OnUserActed(const std::string& action) OVERRIDE; 48 virtual void OnUserActed(const std::string& action) override;
49 49
50 // Context for sharing data between C++ and JS. 50 // Context for sharing data between C++ and JS.
51 // TODO(dzhioev): move to BaseScreen when possible. 51 // TODO(dzhioev): move to BaseScreen when possible.
52 ScreenContext context_; 52 ScreenContext context_;
53 53
54 ControllerPairingScreenActor* actor_; 54 ControllerPairingScreenActor* actor_;
55 55
56 // Controller performing pairing. Owned by the wizard controller. 56 // Controller performing pairing. Owned by the wizard controller.
57 pairing_chromeos::ControllerPairingController* controller_; 57 pairing_chromeos::ControllerPairingController* controller_;
58 58
59 // Current stage of pairing process. 59 // Current stage of pairing process.
60 Stage current_stage_; 60 Stage current_stage_;
61 61
62 // If this one is |false| first device in device list will be preselected on 62 // If this one is |false| first device in device list will be preselected on
63 // next device list update. 63 // next device list update.
64 bool device_preselected_; 64 bool device_preselected_;
65 65
66 DISALLOW_COPY_AND_ASSIGN(ControllerPairingScreen); 66 DISALLOW_COPY_AND_ASSIGN(ControllerPairingScreen);
67 }; 67 };
68 68
69 } // namespace chromeos 69 } // namespace chromeos
70 70
71 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_H_ 71 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698