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

Side by Side Diff: chrome/browser/chromeos/login/screens/host_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_HOST_PAIRING_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_HOST_PAIRING_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_HOST_PAIRING_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_HOST_PAIRING_SCREEN_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "chrome/browser/chromeos/login/screens/host_pairing_screen_actor.h" 9 #include "chrome/browser/chromeos/login/screens/host_pairing_screen_actor.h"
10 #include "chrome/browser/chromeos/login/screens/screen_context.h" 10 #include "chrome/browser/chromeos/login/screens/screen_context.h"
(...skipping 10 matching lines...) Expand all
21 HostPairingScreen(ScreenObserver* observer, HostPairingScreenActor* actor, 21 HostPairingScreen(ScreenObserver* observer, HostPairingScreenActor* actor,
22 pairing_chromeos::HostPairingController* controller); 22 pairing_chromeos::HostPairingController* controller);
23 virtual ~HostPairingScreen(); 23 virtual ~HostPairingScreen();
24 24
25 private: 25 private:
26 typedef pairing_chromeos::HostPairingController::Stage Stage; 26 typedef pairing_chromeos::HostPairingController::Stage Stage;
27 27
28 void CommitContextChanges(); 28 void CommitContextChanges();
29 29
30 // Overridden from WizardScreen: 30 // Overridden from WizardScreen:
31 virtual void PrepareToShow() OVERRIDE; 31 virtual void PrepareToShow() override;
32 virtual void Show() OVERRIDE; 32 virtual void Show() override;
33 virtual void Hide() OVERRIDE; 33 virtual void Hide() override;
34 virtual std::string GetName() const OVERRIDE; 34 virtual std::string GetName() const override;
35 35
36 // pairing_chromeos::HostPairingController::Observer: 36 // pairing_chromeos::HostPairingController::Observer:
37 virtual void PairingStageChanged(Stage new_stage) OVERRIDE; 37 virtual void PairingStageChanged(Stage new_stage) override;
38 virtual void ConfigureHost(bool accepted_eula, 38 virtual void ConfigureHost(bool accepted_eula,
39 const std::string& lang, 39 const std::string& lang,
40 const std::string& timezone, 40 const std::string& timezone,
41 bool send_reports, 41 bool send_reports,
42 const std::string& keyboard_layout) OVERRIDE; 42 const std::string& keyboard_layout) override;
43 virtual void EnrollHost(const std::string& auth_token) OVERRIDE; 43 virtual void EnrollHost(const std::string& auth_token) override;
44 44
45 // Overridden from ControllerPairingView::Delegate: 45 // Overridden from ControllerPairingView::Delegate:
46 virtual void OnActorDestroyed(HostPairingScreenActor* actor) OVERRIDE; 46 virtual void OnActorDestroyed(HostPairingScreenActor* actor) override;
47 47
48 // Context for sharing data between C++ and JS. 48 // Context for sharing data between C++ and JS.
49 // TODO(dzhioev): move to BaseScreen when possible. 49 // TODO(dzhioev): move to BaseScreen when possible.
50 ScreenContext context_; 50 ScreenContext context_;
51 51
52 HostPairingScreenActor* actor_; 52 HostPairingScreenActor* actor_;
53 53
54 // Controller performing pairing. Owned by the wizard controller. 54 // Controller performing pairing. Owned by the wizard controller.
55 pairing_chromeos::HostPairingController* controller_; 55 pairing_chromeos::HostPairingController* controller_;
56 56
57 // Current stage of pairing process. 57 // Current stage of pairing process.
58 Stage current_stage_; 58 Stage current_stage_;
59 59
60 DISALLOW_COPY_AND_ASSIGN(HostPairingScreen); 60 DISALLOW_COPY_AND_ASSIGN(HostPairingScreen);
61 }; 61 };
62 62
63 } // namespace chromeos 63 } // namespace chromeos
64 64
65 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_HOST_PAIRING_SCREEN_H_ 65 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_HOST_PAIRING_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698