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

Side by Side Diff: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (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_AURA_CHROME_BROWSER_MAIN_EXTRA_PARTS_AURA_H_ 5 #ifndef CHROME_BROWSER_UI_AURA_CHROME_BROWSER_MAIN_EXTRA_PARTS_AURA_H_
6 #define CHROME_BROWSER_UI_AURA_CHROME_BROWSER_MAIN_EXTRA_PARTS_AURA_H_ 6 #define CHROME_BROWSER_UI_AURA_CHROME_BROWSER_MAIN_EXTRA_PARTS_AURA_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "chrome/browser/chrome_browser_main_extra_parts.h" 11 #include "chrome/browser/chrome_browser_main_extra_parts.h"
12 12
13 class ActiveDesktopMonitor; 13 class ActiveDesktopMonitor;
14 14
15 class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts { 15 class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts {
16 public: 16 public:
17 ChromeBrowserMainExtraPartsAura(); 17 ChromeBrowserMainExtraPartsAura();
18 virtual ~ChromeBrowserMainExtraPartsAura(); 18 virtual ~ChromeBrowserMainExtraPartsAura();
19 19
20 // Overridden from ChromeBrowserMainExtraParts: 20 // Overridden from ChromeBrowserMainExtraParts:
21 virtual void PreEarlyInitialization() OVERRIDE; 21 virtual void PreEarlyInitialization() override;
22 virtual void ToolkitInitialized() OVERRIDE; 22 virtual void ToolkitInitialized() override;
23 virtual void PreCreateThreads() OVERRIDE; 23 virtual void PreCreateThreads() override;
24 virtual void PreProfileInit() OVERRIDE; 24 virtual void PreProfileInit() override;
25 virtual void PostMainMessageLoopRun() OVERRIDE; 25 virtual void PostMainMessageLoopRun() override;
26 26
27 private: 27 private:
28 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 28 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
29 // On the Linux desktop, we want to prevent the user from logging in as root, 29 // On the Linux desktop, we want to prevent the user from logging in as root,
30 // so that we don't destroy the profile. 30 // so that we don't destroy the profile.
31 void DetectRunningAsRoot(); 31 void DetectRunningAsRoot();
32 #endif 32 #endif
33 33
34 scoped_ptr<ActiveDesktopMonitor> active_desktop_monitor_; 34 scoped_ptr<ActiveDesktopMonitor> active_desktop_monitor_;
35 35
36 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAura); 36 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAura);
37 }; 37 };
38 38
39 #endif // CHROME_BROWSER_UI_AURA_CHROME_BROWSER_MAIN_EXTRA_PARTS_AURA_H_ 39 #endif // CHROME_BROWSER_UI_AURA_CHROME_BROWSER_MAIN_EXTRA_PARTS_AURA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/aura/active_desktop_monitor.h ('k') | chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698