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

Side by Side Diff: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 (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 #ifndef CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_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 "chrome/browser/chrome_browser_main_extra_parts.h" 10 #include "chrome/browser/chrome_browser_main_extra_parts.h"
11 11
12 #if defined(USE_AURA) 12 #if defined(USE_AURA)
13 namespace wm { 13 namespace wm {
14 class WMState; 14 class WMState;
15 } 15 }
16 #endif 16 #endif
17 17
18 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { 18 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts {
19 public: 19 public:
20 ChromeBrowserMainExtraPartsViews(); 20 ChromeBrowserMainExtraPartsViews();
21 virtual ~ChromeBrowserMainExtraPartsViews(); 21 virtual ~ChromeBrowserMainExtraPartsViews();
22 22
23 // Overridden from ChromeBrowserMainExtraParts: 23 // Overridden from ChromeBrowserMainExtraParts:
24 virtual void ToolkitInitialized() OVERRIDE; 24 virtual void ToolkitInitialized() override;
25 25
26 private: 26 private:
27 #if defined(USE_AURA) 27 #if defined(USE_AURA)
28 scoped_ptr<wm::WMState> wm_state_; 28 scoped_ptr<wm::WMState> wm_state_;
29 #endif 29 #endif
30 30
31 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); 31 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews);
32 }; 32 };
33 33
34 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ 34 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698