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

Side by Side Diff: ui/views_content_client/views_content_client_main_parts_aura.h

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 #ifndef UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_AURA_H_ 5 #ifndef UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_AURA_H_
6 #define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_AURA_H_ 6 #define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_AURA_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/views_content_client/views_content_client_main_parts.h" 10 #include "ui/views_content_client/views_content_client_main_parts.h"
11 11
12 namespace wm { 12 namespace wm {
13 class WMState; 13 class WMState;
14 } 14 }
15 15
16 namespace ui { 16 namespace ui {
17 17
18 class ViewsContentClientMainPartsAura : public ViewsContentClientMainParts { 18 class ViewsContentClientMainPartsAura : public ViewsContentClientMainParts {
19 protected: 19 protected:
20 ViewsContentClientMainPartsAura( 20 ViewsContentClientMainPartsAura(
21 const content::MainFunctionParams& content_params, 21 const content::MainFunctionParams& content_params,
22 ViewsContentClient* views_content_client); 22 ViewsContentClient* views_content_client);
23 virtual ~ViewsContentClientMainPartsAura(); 23 virtual ~ViewsContentClientMainPartsAura();
24 24
25 // content::BrowserMainParts: 25 // content::BrowserMainParts:
26 virtual void ToolkitInitialized() OVERRIDE; 26 virtual void ToolkitInitialized() override;
27 virtual void PostMainMessageLoopRun() OVERRIDE; 27 virtual void PostMainMessageLoopRun() override;
28 28
29 private: 29 private:
30 scoped_ptr< ::wm::WMState> wm_state_; 30 scoped_ptr< ::wm::WMState> wm_state_;
31 31
32 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsAura); 32 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsAura);
33 }; 33 };
34 34
35 } // namespace ui 35 } // namespace ui
36 36
37 #endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_AURA_H_ 37 #endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698