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

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

Issue 855453003: Update {virtual,override,final} for ui/views_content_client to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20141229-MacViews-bringup2
Patch Set: fix chromeos too Created 5 years, 11 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 | « ui/views_content_client/views_content_client_main_parts_chromeos.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/browser/plugin_service.h" 10 #include "content/public/browser/plugin_service.h"
(...skipping 16 matching lines...) Expand all
27 27
28 namespace ui { 28 namespace ui {
29 29
30 namespace { 30 namespace {
31 31
32 class ViewsContentClientMainPartsMac : public ViewsContentClientMainParts { 32 class ViewsContentClientMainPartsMac : public ViewsContentClientMainParts {
33 public: 33 public:
34 ViewsContentClientMainPartsMac( 34 ViewsContentClientMainPartsMac(
35 const content::MainFunctionParams& content_params, 35 const content::MainFunctionParams& content_params,
36 ViewsContentClient* views_content_client); 36 ViewsContentClient* views_content_client);
37 virtual ~ViewsContentClientMainPartsMac(); 37 ~ViewsContentClientMainPartsMac() override;
38 38
39 // content::BrowserMainParts: 39 // content::BrowserMainParts:
40 virtual void PreMainMessageLoopRun() override; 40 void PreMainMessageLoopRun() override;
41 41
42 private: 42 private:
43 base::scoped_nsobject<ViewsContentClientAppController> app_controller_; 43 base::scoped_nsobject<ViewsContentClientAppController> app_controller_;
44 44
45 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsMac); 45 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsMac);
46 }; 46 };
47 47
48 ViewsContentClientMainPartsMac::ViewsContentClientMainPartsMac( 48 ViewsContentClientMainPartsMac::ViewsContentClientMainPartsMac(
49 const content::MainFunctionParams& content_params, 49 const content::MainFunctionParams& content_params,
50 ViewsContentClient* views_content_client) 50 ViewsContentClient* views_content_client)
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 NSString* quitTitle = [@"Quit " stringByAppendingString:appName]; 114 NSString* quitTitle = [@"Quit " stringByAppendingString:appName];
115 [appMenu addItemWithTitle:quitTitle 115 [appMenu addItemWithTitle:quitTitle
116 action:@selector(terminate:) 116 action:@selector(terminate:)
117 keyEquivalent:@"q"]; 117 keyEquivalent:@"q"];
118 [appMenuItem setSubmenu:appMenu]; 118 [appMenuItem setSubmenu:appMenu];
119 119
120 task_.Run(); 120 task_.Run();
121 } 121 }
122 122
123 @end 123 @end
OLDNEW
« no previous file with comments | « ui/views_content_client/views_content_client_main_parts_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698