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

Side by Side Diff: content/shell/app/shell_main_delegate.h

Issue 637183002: Replace FINAL and OVERRIDE with their C++11 counterparts in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch 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
« no previous file with comments | « content/shell/app/shell_crash_reporter_client.h ('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 (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 CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_ 5 #ifndef CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_
6 #define CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_ 6 #define CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/public/app/content_main_delegate.h" 10 #include "content/public/app/content_main_delegate.h"
11 #include "content/shell/common/shell_content_client.h" 11 #include "content/shell/common/shell_content_client.h"
12 12
13 namespace content { 13 namespace content {
14 class ShellContentBrowserClient; 14 class ShellContentBrowserClient;
15 class ShellContentRendererClient; 15 class ShellContentRendererClient;
16 16
17 #if defined(OS_ANDROID) 17 #if defined(OS_ANDROID)
18 class BrowserMainRunner; 18 class BrowserMainRunner;
19 #endif 19 #endif
20 20
21 class ShellMainDelegate : public ContentMainDelegate { 21 class ShellMainDelegate : public ContentMainDelegate {
22 public: 22 public:
23 ShellMainDelegate(); 23 ShellMainDelegate();
24 virtual ~ShellMainDelegate(); 24 virtual ~ShellMainDelegate();
25 25
26 // ContentMainDelegate implementation: 26 // ContentMainDelegate implementation:
27 virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; 27 virtual bool BasicStartupComplete(int* exit_code) override;
28 virtual void PreSandboxStartup() OVERRIDE; 28 virtual void PreSandboxStartup() override;
29 virtual int RunProcess( 29 virtual int RunProcess(
30 const std::string& process_type, 30 const std::string& process_type,
31 const MainFunctionParams& main_function_params) OVERRIDE; 31 const MainFunctionParams& main_function_params) override;
32 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) 32 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
33 virtual void ZygoteForked() OVERRIDE; 33 virtual void ZygoteForked() override;
34 #endif 34 #endif
35 virtual ContentBrowserClient* CreateContentBrowserClient() OVERRIDE; 35 virtual ContentBrowserClient* CreateContentBrowserClient() override;
36 virtual ContentRendererClient* CreateContentRendererClient() OVERRIDE; 36 virtual ContentRendererClient* CreateContentRendererClient() override;
37 37
38 static void InitializeResourceBundle(); 38 static void InitializeResourceBundle();
39 39
40 private: 40 private:
41 scoped_ptr<ShellContentBrowserClient> browser_client_; 41 scoped_ptr<ShellContentBrowserClient> browser_client_;
42 scoped_ptr<ShellContentRendererClient> renderer_client_; 42 scoped_ptr<ShellContentRendererClient> renderer_client_;
43 ShellContentClient content_client_; 43 ShellContentClient content_client_;
44 44
45 #if defined(OS_ANDROID) 45 #if defined(OS_ANDROID)
46 scoped_ptr<BrowserMainRunner> browser_runner_; 46 scoped_ptr<BrowserMainRunner> browser_runner_;
47 #endif 47 #endif
48 48
49 DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate); 49 DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
50 }; 50 };
51 51
52 } // namespace content 52 } // namespace content
53 53
54 #endif // CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_ 54 #endif // CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_
OLDNEW
« no previous file with comments | « content/shell/app/shell_crash_reporter_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698