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

Side by Side Diff: ash/shell/content_client/shell_content_browser_client.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
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_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 10 matching lines...) Expand all
21 21
22 class ShellBrowserMainParts; 22 class ShellBrowserMainParts;
23 23
24 class ShellContentBrowserClient : public content::ContentBrowserClient { 24 class ShellContentBrowserClient : public content::ContentBrowserClient {
25 public: 25 public:
26 ShellContentBrowserClient(); 26 ShellContentBrowserClient();
27 virtual ~ShellContentBrowserClient(); 27 virtual ~ShellContentBrowserClient();
28 28
29 // Overridden from content::ContentBrowserClient: 29 // Overridden from content::ContentBrowserClient:
30 virtual content::BrowserMainParts* CreateBrowserMainParts( 30 virtual content::BrowserMainParts* CreateBrowserMainParts(
31 const content::MainFunctionParams& parameters) OVERRIDE; 31 const content::MainFunctionParams& parameters) override;
32 virtual net::URLRequestContextGetter* CreateRequestContext( 32 virtual net::URLRequestContextGetter* CreateRequestContext(
33 content::BrowserContext* browser_context, 33 content::BrowserContext* browser_context,
34 content::ProtocolHandlerMap* protocol_handlers, 34 content::ProtocolHandlerMap* protocol_handlers,
35 content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE; 35 content::URLRequestInterceptorScopedVector request_interceptors) override;
36 36
37 content::ShellBrowserContext* browser_context(); 37 content::ShellBrowserContext* browser_context();
38 38
39 private: 39 private:
40 ShellBrowserMainParts* shell_browser_main_parts_; 40 ShellBrowserMainParts* shell_browser_main_parts_;
41 41
42 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); 42 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient);
43 }; 43 };
44 44
45 } // namespace shell 45 } // namespace shell
46 } // namespace ash 46 } // namespace ash
47 47
48 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 48 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « ash/shell/content_client/shell_browser_main_parts.cc ('k') | ash/shell/content_client/shell_main_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698