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

Side by Side Diff: extensions/shell/browser/shell_browser_main_parts.h

Issue 622343002: replace OVERRIDE and FINAL with override and final in extensions/ (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 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 EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ 5 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
6 #define EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ 6 #define EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_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"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 public: 47 public:
48 ShellBrowserMainParts(const content::MainFunctionParams& parameters, 48 ShellBrowserMainParts(const content::MainFunctionParams& parameters,
49 ShellBrowserMainDelegate* browser_main_delegate); 49 ShellBrowserMainDelegate* browser_main_delegate);
50 virtual ~ShellBrowserMainParts(); 50 virtual ~ShellBrowserMainParts();
51 51
52 ShellBrowserContext* browser_context() { return browser_context_.get(); } 52 ShellBrowserContext* browser_context() { return browser_context_.get(); }
53 53
54 ShellExtensionSystem* extension_system() { return extension_system_; } 54 ShellExtensionSystem* extension_system() { return extension_system_; }
55 55
56 // BrowserMainParts overrides. 56 // BrowserMainParts overrides.
57 virtual void PreEarlyInitialization() OVERRIDE; 57 virtual void PreEarlyInitialization() override;
58 virtual void PreMainMessageLoopStart() OVERRIDE; 58 virtual void PreMainMessageLoopStart() override;
59 virtual void PostMainMessageLoopStart() OVERRIDE; 59 virtual void PostMainMessageLoopStart() override;
60 virtual int PreCreateThreads() OVERRIDE; 60 virtual int PreCreateThreads() override;
61 virtual void PreMainMessageLoopRun() OVERRIDE; 61 virtual void PreMainMessageLoopRun() override;
62 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; 62 virtual bool MainMessageLoopRun(int* result_code) override;
63 virtual void PostMainMessageLoopRun() OVERRIDE; 63 virtual void PostMainMessageLoopRun() override;
64 virtual void PostDestroyThreads() OVERRIDE; 64 virtual void PostDestroyThreads() override;
65 65
66 private: 66 private:
67 // Creates and initializes the ExtensionSystem. 67 // Creates and initializes the ExtensionSystem.
68 void CreateExtensionSystem(); 68 void CreateExtensionSystem();
69 69
70 #if defined(OS_CHROMEOS) 70 #if defined(OS_CHROMEOS)
71 scoped_ptr<ShellNetworkController> network_controller_; 71 scoped_ptr<ShellNetworkController> network_controller_;
72 scoped_ptr<ShellAudioController> audio_controller_; 72 scoped_ptr<ShellAudioController> audio_controller_;
73 #endif 73 #endif
74 scoped_ptr<DesktopController> desktop_controller_; 74 scoped_ptr<DesktopController> desktop_controller_;
(...skipping 17 matching lines...) Expand all
92 bool run_message_loop_; 92 bool run_message_loop_;
93 93
94 scoped_ptr<ShellBrowserMainDelegate> browser_main_delegate_; 94 scoped_ptr<ShellBrowserMainDelegate> browser_main_delegate_;
95 95
96 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); 96 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
97 }; 97 };
98 98
99 } // namespace extensions 99 } // namespace extensions
100 100
101 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ 101 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_browser_context.h ('k') | extensions/shell/browser/shell_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698