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

Side by Side Diff: remoting/host/continue_window_mac.mm

Issue 628753002: replace OVERRIDE and FINAL with override and final in remoting/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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
« no previous file with comments | « remoting/host/continue_window_linux.cc ('k') | remoting/host/continue_window_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/mac/scoped_nsautorelease_pool.h" 9 #include "base/mac/scoped_nsautorelease_pool.h"
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
(...skipping 21 matching lines...) Expand all
32 32
33 // A bridge between C++ and ObjC implementations of ContinueWindow. 33 // A bridge between C++ and ObjC implementations of ContinueWindow.
34 // Everything important occurs in ContinueWindowMacController. 34 // Everything important occurs in ContinueWindowMacController.
35 class ContinueWindowMac : public ContinueWindow { 35 class ContinueWindowMac : public ContinueWindow {
36 public: 36 public:
37 ContinueWindowMac(); 37 ContinueWindowMac();
38 virtual ~ContinueWindowMac(); 38 virtual ~ContinueWindowMac();
39 39
40 protected: 40 protected:
41 // ContinueWindow overrides. 41 // ContinueWindow overrides.
42 virtual void ShowUi() OVERRIDE; 42 virtual void ShowUi() override;
43 virtual void HideUi() OVERRIDE; 43 virtual void HideUi() override;
44 44
45 private: 45 private:
46 base::scoped_nsobject<ContinueWindowMacController> controller_; 46 base::scoped_nsobject<ContinueWindowMacController> controller_;
47 47
48 DISALLOW_COPY_AND_ASSIGN(ContinueWindowMac); 48 DISALLOW_COPY_AND_ASSIGN(ContinueWindowMac);
49 }; 49 };
50 50
51 ContinueWindowMac::ContinueWindowMac() { 51 ContinueWindowMac::ContinueWindowMac() {
52 } 52 }
53 53
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 [self hide]; 155 [self hide];
156 continue_window_->DisconnectSession(); 156 continue_window_->DisconnectSession();
157 } 157 }
158 158
159 - (void)onContinue:(id)sender { 159 - (void)onContinue:(id)sender {
160 [self hide]; 160 [self hide];
161 continue_window_->ContinueSession(); 161 continue_window_->ContinueSession();
162 } 162 }
163 163
164 @end 164 @end
OLDNEW
« no previous file with comments | « remoting/host/continue_window_linux.cc ('k') | remoting/host/continue_window_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698