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

Side by Side Diff: ui/views_content_client/views_content_client_main_parts_mac.mm

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (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
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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/mac/scoped_nsobject.h" 8 #include "base/mac/scoped_nsobject.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "content/public/common/content_paths.h" 10 #include "content/public/common/content_paths.h"
(...skipping 18 matching lines...) Expand all
29 namespace { 29 namespace {
30 30
31 class ViewsContentClientMainPartsMac : public ViewsContentClientMainParts { 31 class ViewsContentClientMainPartsMac : public ViewsContentClientMainParts {
32 public: 32 public:
33 ViewsContentClientMainPartsMac( 33 ViewsContentClientMainPartsMac(
34 const content::MainFunctionParams& content_params, 34 const content::MainFunctionParams& content_params,
35 ViewsContentClient* views_content_client); 35 ViewsContentClient* views_content_client);
36 virtual ~ViewsContentClientMainPartsMac(); 36 virtual ~ViewsContentClientMainPartsMac();
37 37
38 // content::BrowserMainParts: 38 // content::BrowserMainParts:
39 virtual void PreMainMessageLoopRun() OVERRIDE; 39 virtual void PreMainMessageLoopRun() override;
40 40
41 private: 41 private:
42 base::scoped_nsobject<ViewsContentClientAppController> app_controller_; 42 base::scoped_nsobject<ViewsContentClientAppController> app_controller_;
43 43
44 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsMac); 44 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsMac);
45 }; 45 };
46 46
47 ViewsContentClientMainPartsMac::ViewsContentClientMainPartsMac( 47 ViewsContentClientMainPartsMac::ViewsContentClientMainPartsMac(
48 const content::MainFunctionParams& content_params, 48 const content::MainFunctionParams& content_params,
49 ViewsContentClient* views_content_client) 49 ViewsContentClient* views_content_client)
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 NSString* quitTitle = [@"Quit " stringByAppendingString:appName]; 109 NSString* quitTitle = [@"Quit " stringByAppendingString:appName];
110 [appMenu addItemWithTitle:quitTitle 110 [appMenu addItemWithTitle:quitTitle
111 action:@selector(terminate:) 111 action:@selector(terminate:)
112 keyEquivalent:@"q"]; 112 keyEquivalent:@"q"];
113 [appMenuItem setSubmenu:appMenu]; 113 [appMenuItem setSubmenu:appMenu];
114 114
115 task_.Run(); 115 task_.Run();
116 } 116 }
117 117
118 @end 118 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698