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

Side by Side Diff: ash/shell/content_client/shell_main_delegate.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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
« no previous file with comments | « ash/shell/content_client/shell_content_browser_client.h ('k') | ash/shell/context_menu.h » ('j') | 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 ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ 5 #ifndef ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_
6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ 6 #define ASH_SHELL_CONTENT_CLIENT_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 ShellContentRendererClient; 14 class ShellContentRendererClient;
15 class ShellContentPluginClient; 15 class ShellContentPluginClient;
16 class ShellContentUtilityClient; 16 class ShellContentUtilityClient;
17 } 17 }
18 18
19 namespace ash { 19 namespace ash {
20 namespace shell { 20 namespace shell {
21 21
22 class ShellContentBrowserClient; 22 class ShellContentBrowserClient;
23 23
24 class ShellMainDelegate : public content::ContentMainDelegate { 24 class ShellMainDelegate : public content::ContentMainDelegate {
25 public: 25 public:
26 ShellMainDelegate(); 26 ShellMainDelegate();
27 virtual ~ShellMainDelegate(); 27 virtual ~ShellMainDelegate();
28 28
29 virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; 29 virtual bool BasicStartupComplete(int* exit_code) override;
30 virtual void PreSandboxStartup() OVERRIDE; 30 virtual void PreSandboxStartup() override;
31 virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE; 31 virtual content::ContentBrowserClient* CreateContentBrowserClient() override;
32 32
33 private: 33 private:
34 void InitializeResourceBundle(); 34 void InitializeResourceBundle();
35 35
36 scoped_ptr<ShellContentBrowserClient> browser_client_; 36 scoped_ptr<ShellContentBrowserClient> browser_client_;
37 content::ShellContentClient content_client_; 37 content::ShellContentClient content_client_;
38 38
39 DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate); 39 DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
40 }; 40 };
41 41
42 } // namespace shell 42 } // namespace shell
43 } // namespace ash 43 } // namespace ash
44 44
45 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ 45 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/shell/content_client/shell_content_browser_client.h ('k') | ash/shell/context_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698